Fix extraction of ogr LayerName from database dataset URIs

strk · strk · commit 003f10e9fc4c · 2016-10-17T11:56:02.000+02:00
See 6c53641#commitcomment-19439676 Includes testcase. REF #15698
diff --git a/python/plugins/processing/tests/ToolsTest.py b/python/plugins/processing/tests/ToolsTest.py
@@ -92,6 +92,12 @@ def linkTestfile(f, t):
         name = vector.ogrLayerName(tmpdir + '|layername=f2|layerid=0')
         self.assertEqual(name, 'f2') # layername takes precedence
 
+        name = vector.ogrLayerName('dbname=\'/tmp/x.sqlite\' table="t" (geometry) sql=')
+        self.assertEqual(name, 't')
+
+        name = vector.ogrLayerName('dbname=\'/tmp/x.sqlite\' table="s.t" (geometry) sql=')
+        self.assertEqual(name, 's.t')
+
     def testFeatures(self):
         ProcessingConfig.initialize()
 
diff --git a/python/plugins/processing/tools/vector.py b/python/plugins/processing/tools/vector.py
@@ -513,6 +513,19 @@ def ogrConnectionString(uri):
 
 
 def ogrLayerName(uri):
+    if 'host' in uri:
+        regex = re.compile('table="(.+?)\.(.+?)"')
+        r = regex.search(uri)
+        return '"' + r.groups()[0] + '.' + r.groups()[1] + '"'
+    elif 'dbname' in uri:
+        regex = re.compile('table="(.+?)"')
+        r = regex.search(uri)
+        return r.groups()[0]
+    elif 'layername' in uri:
+        regex = re.compile('(layername=)([^|]*)')
+        r = regex.search(uri)
+        return r.groups()[1]
+
     fields = uri.split('|')
     ogruri = fields[0]
     fields = fields[1:]
