[processing][ogr] Fix conversion of non-disk based layer sources

to GDAL commands Fixes #19946
qgis · Sep 28, 2018 · 7977450 · 7977450
1 parent f1ced30
commit 7977450
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithm.py b/python/plugins/processing/algs/gdal/GdalAlgorithm.py
@@ -115,7 +115,7 @@ def getOgrCompatibleSource(self, parameter_name, parameters, context, feedback,
         else:
             # vector layer, but not OGR - get OGR compatible path
             # TODO - handle "selected features only" mode!!
-            ogr_data_path = GdalUtils.ogrConnectionString(input_layer.dataProvider().dataSourceUri(), context)
+            ogr_data_path = GdalUtils.ogrConnectionStringFromLayer(input_layer)
             ogr_layer_name = GdalUtils.ogrLayerName(input_layer.dataProvider().dataSourceUri())
         return ogr_data_path, ogr_layer_name
 

diff --git a/python/plugins/processing/algs/gdal/GdalUtils.py b/python/plugins/processing/algs/gdal/GdalUtils.py
@@ -259,10 +259,10 @@ def gdalHelpPath():
         return helpPath if helpPath is not None else 'http://www.gdal.org/'
 
     @staticmethod
-    def ogrConnectionString(uri, context):
-        """Generates OGR connection string from layer source
+    def ogrConnectionStringFromLayer(layer):
+        """Generates OGR connection string from a layer
         """
-        return GdalUtils.ogrConnectionStringAndFormat(uri, context)[0]
+        return GdalUtils.ogrConnectionStringAndFormatFromLayer(layer)[0]
 
     @staticmethod
     def ogrConnectionStringAndFormat(uri, context):

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
@@ -130,7 +130,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             uri = GeoDB(uri=uri).uri
 
         inLayer = self.getParameterValue(self.INPUT_LAYER)
-        ogrLayer = GdalUtils.ogrConnectionString(inLayer, context)
+        ogrLayer = GdalUtils.ogrConnectionStringFromLayer(inLayer)
         shapeEncoding = self.getParameterValue(self.SHAPE_ENCODING)
         schema = str(self.getParameterValue(self.SCHEMA))
         table = str(self.getParameterValue(self.TABLE))

diff --git a/python/plugins/processing/algs/gdal/ogrinfo.py b/python/plugins/processing/algs/gdal/ogrinfo.py
@@ -85,7 +85,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         if inLayer is None:
             raise QgsProcessingException(self.invalidSourceError(parameters, self.INPUT))
 
-        connectionString = GdalUtils.ogrConnectionString(inLayer.source(), context)
+        connectionString = GdalUtils.ogrConnectionStringFromLayer(inLayer)
         arguments.append(connectionString)
         return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]
 

diff --git a/python/plugins/processing/algs/gdal/rasterize_over.py b/python/plugins/processing/algs/gdal/rasterize_over.py
@@ -78,8 +78,8 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         inLayer = QgsProcessingUtils.mapLayerFromString(self.getParameterValue(self.INPUT), context)
         inRasterLayer = QgsProcessingUtils.mapLayerFromString(self.getParameterValue(self.INPUT_RASTER), context)
 
-        ogrLayer = GdalUtils.ogrConnectionString(inLayer, context)
-        ogrRasterLayer = GdalUtils.ogrConnectionString(inRasterLayer, context)
+        ogrLayer = GdalUtils.ogrConnectionStringFromLayer(inLayer)
+        ogrRasterLayer = GdalUtils.ogrConnectionStringFromLayer(inRasterLayer)
 
         arguments = []
         arguments.append('-a')