Fix layer handling in import to postgis algs

qgis · Dec 8, 2017 · b578f8a · b578f8a
1 parent 2d4a465
commit b578f8a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/python/plugins/processing/algs/gdal/OgrToPostGis.py b/python/plugins/processing/algs/gdal/OgrToPostGis.py
@@ -185,7 +185,6 @@ def getConnectionString(self, parameters, context):
         return GdalUtils.escapeAndJoin(arguments)
 
     def getConsoleCommands(self, parameters, context, feedback, executing=True):
-        inLayer = self.parameterAsSource(parameters, self.INPUT, context)
         ogrLayer, layername = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
         shapeEncoding = self.parameterAsString(parameters, self.SHAPE_ENCODING, context)
         ssrs = self.parameterAsCrs(parameters, self.S_SRS, context).authid()
@@ -233,7 +232,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         arguments.append('"')
         arguments.append(dimstring)
         arguments.append(ogrLayer)
-        arguments.append(GdalUtils.ogrLayerName(inLayer))
+        arguments.append(layername)
         if index:
             arguments.append(indexstring)
         if launder:
@@ -254,7 +253,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         elif primary_key is not None:
             arguments.append("-lco FID=" + primary_key)
         if len(table) == 0:
-            table = GdalUtils.ogrLayerName(inLayer).lower()
+            table = layername.lower()
         if schema:
             table = '{}.{}'.format(schema, table)
         arguments.append('-nln')

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
@@ -253,7 +253,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         elif primary_key is not None:
             arguments.append("-lco FID=" + primary_key)
         if len(table) == 0:
-            table = GdalUtils.ogrLayerName(inLayer).lower()
+            table = layername.lower()
         if schema:
             table = '{}.{}'.format(schema, table)
         arguments.append('-nln')