[BUGFIX][DB Manager] Detect query layer like providers do

In postgres provider, a query layer is detected as a table starting with `(` and ending with `)`.
qgis · Feb 2, 2017 · 2a77ba7 · 2a77ba7
1 parent c861682
commit 2a77ba7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/python/plugins/db_manager/db_manager_plugin.py b/python/plugins/db_manager/db_manager_plugin.py
@@ -81,7 +81,8 @@ def unload(self):
     def onLayerWasAdded(self, aMapLayer):
         if hasattr(aMapLayer, 'dataProvider') and aMapLayer.dataProvider().name() in ['postgres', 'spatialite', 'oracle']:
             uri = QgsDataSourceUri(aMapLayer.source())
-            if re.search('^\(SELECT .+ FROM .+\)$', uri.table(), re.S):
+            table = uri.table()
+            if table.startswith('(') and table.endswith(')'):
                 self.addCustomActionForLayer(self.layerAction, aMapLayer)
         # virtual has QUrl source
         # url = QUrl(QUrl.fromPercentEncoding(l.source()))
@@ -92,8 +93,8 @@ def onLayerWasAdded(self, aMapLayer):
     def onUpdateSqlLayer(self):
         l = self.iface.activeLayer()
         if l.dataProvider().name() in ['postgres', 'spatialite', 'oracle']:
-            uri = QgsDataSourceUri(l.source())
-            if re.search('^\(SELECT .+ FROM .+\)$', uri.table(), re.S):
+            table = uri.table()
+            if table.startswith('(') and table.endswith(')'):
                 self.run()
                 self.dlg.runSqlLayerWindow(l)
         # virtual has QUrl source