Fix postgis 12 adscr -> adbin consrc -> conbin

qgis · Nov 6, 2019 · bfea17e · bfea17e
1 parent 22765cb
commit bfea17e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py
@@ -488,14 +488,17 @@ def getTableFields(self, table):
         schema, tablename = self.getSchemaTableName(table)
         schema_where = u" AND nspname=%s " % self.quoteString(schema) if schema is not None else ""
 
+        version_number = int(self.getInfo()[0].split(' ')[1].split('.')[0])
+        ad_col_name = 'adsrc' if version_number < 12 else 'adbin'
+
         sql = u"""SELECT a.attnum AS ordinal_position,
                                 a.attname AS column_name,
                                 t.typname AS data_type,
                                 a.attlen AS char_max_len,
                                 a.atttypmod AS modifier,
                                 a.attnotnull AS notnull,
                                 a.atthasdef AS hasdefault,
-                                adef.adsrc AS default_value,
+                                adef.%s AS default_value,
                                 pg_catalog.format_type(a.atttypid,a.atttypmod) AS formatted_type
                         FROM pg_class c
                         JOIN pg_attribute a ON a.attrelid = c.oid
@@ -504,7 +507,7 @@ def getTableFields(self, table):
                         LEFT JOIN pg_attrdef adef ON adef.adrelid = a.attrelid AND adef.adnum = a.attnum
                         WHERE
                           a.attnum > 0 AND c.relname=%s %s
-                        ORDER BY a.attnum""" % (self.quoteString(tablename), schema_where)
+                        ORDER BY a.attnum""" % (ad_col_name, self.quoteString(tablename), schema_where)
 
         c = self._execute(None, sql)
         res = self._fetchall(c)
@@ -533,12 +536,15 @@ def getTableConstraints(self, table):
         schema, tablename = self.getSchemaTableName(table)
         schema_where = u" AND nspname=%s " % self.quoteString(schema) if schema is not None else ""
 
-        sql = u"""SELECT c.conname, c.contype, c.condeferrable, c.condeferred, array_to_string(c.conkey, ' '), c.consrc,
+        version_number = int(self.getInfo()[0].split(' ')[1].split('.')[0])
+        con_col_name = 'consrc' if version_number < 12 else 'conbin'
+
+        sql = u"""SELECT c.conname, c.contype, c.condeferrable, c.condeferred, array_to_string(c.conkey, ' '), c.%s,
                          t2.relname, c.confupdtype, c.confdeltype, c.confmatchtype, array_to_string(c.confkey, ' ') FROM pg_constraint c
                   LEFT JOIN pg_class t ON c.conrelid = t.oid
                         LEFT JOIN pg_class t2 ON c.confrelid = t2.oid
                         JOIN pg_namespace nsp ON t.relnamespace = nsp.oid
-                        WHERE t.relname = %s %s """ % (self.quoteString(tablename), schema_where)
+                        WHERE t.relname = %s %s """ % (con_col_name, self.quoteString(tablename), schema_where)
 
         c = self._execute(None, sql)
         res = self._fetchall(c)

diff --git a/python/plugins/processing/tools/postgis.py b/python/plugins/processing/tools/postgis.py
@@ -379,14 +379,18 @@ def get_table_fields(self, table, schema=None):
         schema_where = (" AND nspname='%s' "
                         % self._quote_unicode(schema) if schema is not None else ''
                         )
+
+        version_number = int(self.get_info().split(' ')[1].split('.')[0])
+        ad_col_name = 'adsrc' if version_number < 12 else 'adbin'
+
         sql = """SELECT a.attnum AS ordinal_position,
                         a.attname AS column_name,
                         t.typname AS data_type,
                         a.attlen AS char_max_len,
                         a.atttypmod AS modifier,
                         a.attnotnull AS notnull,
                         a.atthasdef AS hasdefault,
-                        adef.adsrc AS default_value
+                        adef.%s AS default_value
               FROM pg_class c
               JOIN pg_attribute a ON a.attrelid = c.oid
               JOIN pg_type t ON a.atttypid = t.oid
@@ -397,7 +401,7 @@ def get_table_fields(self, table, schema=None):
                   c.relname = '%s' %s AND
                   a.attnum > 0
               ORDER BY a.attnum""" \
-              % (self._quote_unicode(table), schema_where)
+              % (ad_col_name, self._quote_unicode(table), schema_where)
 
         self._exec_sql(c, sql)
         attrs = []
@@ -437,16 +441,20 @@ def get_table_constraints(self, table, schema=None):
         schema_where = (" AND nspname='%s' "
                         % self._quote_unicode(schema) if schema is not None else ''
                         )
+
+        version_number = int(self.get_info().split(' ')[1].split('.')[0])
+        con_col_name = 'consrc' if version_number < 12 else 'conbin'
+
         sql = """SELECT c.conname, c.contype, c.condeferrable, c.condeferred,
-                        array_to_string(c.conkey, ' '), c.consrc, t2.relname,
+                        array_to_string(c.conkey, ' '), c.%s, t2.relname,
                         c.confupdtype, c.confdeltype, c.confmatchtype,
                         array_to_string(c.confkey, ' ')
               FROM pg_constraint c
               LEFT JOIN pg_class t ON c.conrelid = t.oid
               LEFT JOIN pg_class t2 ON c.confrelid = t2.oid
               JOIN pg_namespace nsp ON t.relnamespace = nsp.oid
               WHERE t.relname = '%s' %s """ \
-              % (self._quote_unicode(table), schema_where)
+              % (con_col_name, self._quote_unicode(table), schema_where)
 
         self._exec_sql(c, sql)