sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix layer handling in import to postgis algs

Browse Source
This commit is contained in:
Nyall Dawson 2017-12-08 15:25:25 +10:00
parent 2d4a465212
commit b578f8af35
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/plugins/processing/algs/gdal/OgrToPostGis.py
View File

@ -185,7 +185,6 @@ class OgrToPostGis(GdalAlgorithm):
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 @@ class OgrToPostGis(GdalAlgorithm):
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 @@ class OgrToPostGis(GdalAlgorithm):
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')

2
python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
View File

@ -253,7 +253,7 @@ class Ogr2OgrToPostGisList(GdalAlgorithm):
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')