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

processing postgis connector quote indexes names

Browse Source
This commit is contained in:
Alessandro Pasotti 2019-05-22 18:28:35 +02:00
parent a4187a7a6e
commit fd4895b9fb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,8 +156,8 @@ class TableField(object):
ALTER TABLE command. ALTER TABLE command.
""" """
data_type = (self.data_type if not self.modifier or self.modifier < data_type = (self.data_type if not self.modifier or self.modifier
0 else '%s(%d)' % (self.data_type, self.modifier)) < 0 else '%s(%d)' % (self.data_type, self.modifier))
txt = '%s %s %s' % (self._quote(self.name), data_type, txt = '%s %s %s' % (self._quote(self.name), data_type,
self.is_null_txt()) self.is_null_txt())
if self.default and len(self.default) > 0: if self.default and len(self.default) > 0:
@ -721,20 +721,20 @@ class GeoDB(object):
table_name = self._table_name(schema, table) table_name = self._table_name(schema, table)
idx_name = self._quote(name) idx_name = self._quote(name)
sql = 'CREATE INDEX %s ON %s (%s)' % (idx_name, table_name, sql = 'CREATE INDEX "%s" ON %s (%s)' % (idx_name, table_name,
self._quote(column)) self._quote(column))
self._exec_sql_and_commit(sql) self._exec_sql_and_commit(sql)
def create_spatial_index(self, table, schema=None, geom_column='the_geom'): def create_spatial_index(self, table, schema=None, geom_column='the_geom'):
table_name = self._table_name(schema, table) table_name = self._table_name(schema, table)
idx_name = self._quote(u"sidx_%s_%s" % (table, geom_column)) idx_name = self._quote(u"sidx_%s_%s" % (table, geom_column))
sql = 'CREATE INDEX %s ON %s USING GIST(%s)' % (idx_name, table_name, sql = 'CREATE INDEX "%s" ON %s USING GIST(%s)' % (idx_name, table_name,
self._quote(geom_column)) self._quote(geom_column))
self._exec_sql_and_commit(sql) self._exec_sql_and_commit(sql)
def delete_index(self, name, schema=None): def delete_index(self, name, schema=None):
index_name = self._table_name(schema, name) index_name = self._table_name(schema, name)
sql = 'DROP INDEX %s' % index_name sql = 'DROP INDEX "%s"' % index_name
self._exec_sql_and_commit(sql) self._exec_sql_and_commit(sql)
def get_database_privileges(self): def get_database_privileges(self):
@ -831,8 +831,8 @@ class GeoDB(object):
try: try:
cursor.execute(sql) cursor.execute(sql)
except psycopg2.Error as e: except psycopg2.Error as e:
raise QgsProcessingException(str(e) + ' QUERY: ' + raise QgsProcessingException(str(e) + ' QUERY: '
e.cursor.query.decode(e.cursor.connection.encoding)) + e.cursor.query.decode(e.cursor.connection.encoding))
def _exec_sql_and_commit(self, sql): def _exec_sql_and_commit(self, sql):
"""Tries to execute and commit some action, on error it rolls """Tries to execute and commit some action, on error it rolls