Because the field 'relhasoids' was dropped in PG12, psqlodbc drivers would have some...

Report and patch by Vladimir Koković.

diff --git a/configure.ac b/configure.ac
index 12f38449da665c05b6eb626004c6564b29797a00..bff7f5a87de53a7415943412d662cb9f9110eb79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,7 +152,7 @@ fi
 
 if test "$with_libpq" != yes; then
    if test -d "$with_libpq"; then
-       PATH="$PATH:$with_libpq/bin"
+       PATH="$with_libpq/bin:$PATH"
        CPPFLAGS="$CPPFLAGS -I$with_libpq/include -I$with_libpq/include/postgresql/internal"
        LDFLAGS="$LDFLAGS -L$with_libpq/lib"
    else

diff --git a/info.c b/info.c
index aac845fd71b79e6b8a219e6a3a7e4d7764797055..3090723bc4e709a89323814253a5851d8e8a9461 100644 (file)
--- a/info.c
+++ b/info.c
@@ -2346,9 +2346,11 @@ retry_public_schema:
        "t.typname, a.attnum, a.attlen, a.atttypmod, a.attnotnull, "
        "c.relhasrules, c.relkind, c.oid, pg_get_expr(d.adbin, d.adrelid), "
         "case t.typtype when 'd' then t.typbasetype else 0 end, t.typtypmod, "
-        "c.relhasoids, %s, c.relhassubclass "
+        "%s, %s, c.relhassubclass "
        "from (((pg_catalog.pg_class c "
-       "inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace", PG_VERSION_GE(conn, 10.0) ? "attidentity" : "''");
+       "inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace",
+            PG_VERSION_GE(conn, 12.0) ? "0" : "c.relhasoids",
+            PG_VERSION_GE(conn, 10.0) ? "attidentity" : "''");
    if (search_by_ids)
        appendPQExpBuffer(&columns_query, " and c.oid = %u", reloid);
    else
@@ -2862,7 +2864,11 @@ retry_public_schema:
    /*
     * Create the query to find out if this is a view or not...
     */
-   appendPQExpBufferStr(&columns_query, "select c.relhasrules, c.relkind, c.relhasoids");
+   appendPQExpBufferStr(&columns_query, "select c.relhasrules, c.relkind");
+   if (PG_VERSION_LT(conn, 12.0))
+       appendPQExpBufferStr(&columns_query, ", c.relhasoids");
+   else
+       appendPQExpBufferStr(&columns_query, ", 0 as relhasoids");
    appendPQExpBufferStr(&columns_query, " from pg_catalog.pg_namespace u,"
                    " pg_catalog.pg_class c where "
                    "u.oid = c.relnamespace");
@@ -3251,7 +3257,7 @@ PGAPI_Statistics(HSTMT hstmt,
    initPQExpBuffer(&index_query);
    printfPQExpBuffer(&index_query, "select c.relname, i.indkey, i.indisunique"
        ", i.indisclustered, a.amname, c.relhasrules, n.nspname"
-       ", c.oid, d.relhasoids, %s"
+       ", c.oid, %s, %s"
        " from pg_catalog.pg_index i, pg_catalog.pg_class c,"
        " pg_catalog.pg_class d, pg_catalog.pg_am a,"
        " pg_catalog.pg_namespace n"
@@ -3261,6 +3267,7 @@ PGAPI_Statistics(HSTMT hstmt,
        " and d.oid = i.indrelid"
        " and i.indexrelid = c.oid"
        " and c.relam = a.oid order by"
+        , PG_VERSION_LT(conn, 12.0) ? "d.relhasoids" : "0"
        , PG_VERSION_GE(conn, 8.3) ? "i.indoption" : "0"
        , eq_string, escTableName, eq_string, escSchemaName);
    appendPQExpBufferStr(&index_query, " i.indisprimary desc,");

diff --git a/parse.c b/parse.c
index e7cb8475b71f1a126fbfe0bbe1538210f7e38134..0ff76bcbabfe253f0d59926cc7e862122e0446a0 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -474,6 +474,8 @@ static BOOL CheckHasOids(StatementClass * stmt)
    TABLE_INFO  *ti;
 
 MYLOG(0, "Entering\n");
+    if (PG_VERSION_GE(conn, 12.0))
+      return FALSE;
    if (0 != SC_checked_hasoids(stmt))
        return TRUE;
    if (!stmt->ti || !stmt->ti[0])