sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix postgis 12 adscr -> adbin consrc -> conbin

Browse Source
This commit is contained in:
Alessandro Pasotti 2019-11-06 12:53:52 +01:00
parent 5910a7b9f1
commit 6c9f01e28d
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/plugins/db_manager/db_plugins/postgis/connector.py
View File

@ -489,6 +489,9 @@ class PostGisDBConnector(DBConnector):
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,
@ -496,7 +499,7 @@ class PostGisDBConnector(DBConnector):
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
@ -505,7 +508,7 @@ class PostGisDBConnector(DBConnector):
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)
@ -534,12 +537,15 @@ class PostGisDBConnector(DBConnector):
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)

16
python/plugins/processing/tools/postgis.py
View File

@ -385,6 +385,10 @@ class GeoDB(object):
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,
@ -392,7 +396,7 @@ class GeoDB(object):
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
@ -403,7 +407,7 @@ class GeoDB(object):
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 = []
@ -443,8 +447,12 @@ class GeoDB(object):
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
@ -452,7 +460,7 @@ class GeoDB(object):
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)