[processing][gdal] Fix empty fid is passed if FID option is not set

Also add full range of unit tests for OgrToPostGis algorithm. Fixes #19947
qgis · Sep 25, 2018 · 6e03253 · 6e03253
1 parent 80723e8
commit 6e03253
Show file tree

Hide file tree

Showing 3 changed files with 344 additions and 4 deletions.
diff --git a/python/plugins/processing/algs/gdal/OgrToPostGis.py b/python/plugins/processing/algs/gdal/OgrToPostGis.py
@@ -288,9 +288,9 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)])
         if len(geocolumn) > 0:
             arguments.append(geocolumnstring)
-        if len(pk) > 0:
+        if pk:
             arguments.append(pkstring)
-        elif primary_key is not None:
+        elif primary_key:
             arguments.append("-lco FID=" + primary_key)
         if len(table) == 0:
             table = layername.lower()

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
@@ -277,9 +277,9 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
             arguments.append(self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)])
         if len(geocolumn) > 0:
             arguments.append(geocolumnstring)
-        if len(pk) > 0:
+        if pk:
             arguments.append(pkstring)
-        elif primary_key is not None:
+        elif primary_key:
             arguments.append("-lco FID=" + primary_key)
         if len(table) == 0:
             table = layername.lower()