Merge pull request #7966 from elpaso/bugfix-19843-dbmanager-quoted-sql

elpaso · web-flow · commit 1b2d885a03e6 · 2018-09-21T09:56:35.000+02:00
[dbmanager] Fix Update SQL Layer converts query to table name
diff --git a/python/plugins/db_manager/dlg_sql_layer_window.py b/python/plugins/db_manager/dlg_sql_layer_window.py
@@ -152,7 +152,8 @@ def __init__(self, iface, layer, parent=None):
             match = re.search('^\((SELECT .+ FROM .+)\)$', sql, re.S)
             if match:
                 sql = match.group(1)
-        if not sql.startswith('(') and not sql.endswith(')'):
+        # Need to check on table() since the parentheses were removed by the regexp
+        if not uri.table().startswith('(') and not uri.table().endswith(')'):
             schema = uri.schema()
             if schema and schema.upper() != 'PUBLIC':
                 sql = 'SELECT * FROM {0}.{1}'.format(self.db.connector.quoteId(schema), self.db.connector.quoteId(sql))
