Merge pull request #45304 from qgis/backport-45223-to-queued_ltr_back…

…ports [Backport queued_ltr_backports] Fix Z/M dimension URI via DB Manager. Fixes #34894
qgis · Sep 30, 2021 · 12be3a6 · 12be3a6
2 parents 0b1ccc6 + 6430269
commit 12be3a6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/python/plugins/db_manager/db_plugins/postgis/plugin.py b/python/plugins/db_manager/db_plugins/postgis/plugin.py
@@ -308,6 +308,24 @@ def runAction(self, action):
             return True
         return VectorTable.runAction(self, action)
 
+    def geometryType(self):
+        """ Returns the proper WKT type.
+        PostGIS records type like this:
+        | WKT Type     | geomType    | geomDim |
+        |--------------|-------------|---------|
+        | LineString   | LineString  | 2       |
+        | LineStringZ  | LineString  | 3       |
+        | LineStringM  | LineStringM | 3       |
+        | LineStringZM | LineString  | 4       |
+        """
+        geometryType = self.geomType
+        if self.geomDim == 3 and self.geomType[-1] != "M":
+            geometryType += "Z"
+        elif self.geomDim == 4:
+            geometryType += "ZM"
+
+        return geometryType
+
 
 class PGRasterTable(PGTable, RasterTable):
 

diff --git a/python/plugins/db_manager/db_tree.py b/python/plugins/db_manager/db_tree.py
@@ -159,7 +159,7 @@ def delete(self):
     def addLayer(self):
         table = self.currentTable()
         if table is not None:
-            layer = table.toMapLayer()
+            layer = table.toMapLayer(table.geometryType())
             layers = QgsProject.instance().addMapLayers([layer])
             if len(layers) != 1:
                 QgsMessageLog.logMessage(