[Processing] Fix ogr2ogr postgis table overwrite

qgis · May 28, 2016 · 75461aa · 75461aa
1 parent 94d88e6
commit 75461aa
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py
@@ -170,9 +170,12 @@ def getConsoleCommands(self):
             arguments.append(pkstring)
         elif primary_key is not None:
             arguments.append("-lco FID=" + primary_key)
-        if len(table) > 0:
-            arguments.append('-nln')
-            arguments.append(table)
+        if len(table) == 0:
+            table = ogrLayerName(inLayer).lower()
+        if schema:
+            table = '{}.{}'.format(schema, table)
+        arguments.append('-nln')
+        arguments.append(table)
         if skipfailures:
             arguments.append('-skipfailures')
         if where:

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
@@ -227,9 +227,12 @@ def getConsoleCommands(self):
             arguments.append(pkstring)
         elif primary_key is not None:
             arguments.append("-lco FID=" + primary_key)
-        if len(table) > 0:
-            arguments.append('-nln')
-            arguments.append(table)
+        if len(table) == 0:
+            table = ogrLayerName(inLayer).lower()
+        if schema:
+            table = '{}.{}'.format(schema, table)
+        arguments.append('-nln')
+        arguments.append(table)
         if len(ssrs) > 0:
             arguments.append('-s_srs')
             arguments.append(ssrs)

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
@@ -233,9 +233,12 @@ def getConsoleCommands(self):
             arguments.append(pkstring)
         elif primary_key is not None:
             arguments.append("-lco FID=" + primary_key)
-        if len(table) > 0:
-            arguments.append('-nln')
-            arguments.append(table)
+        if len(table) == 0:
+            table = ogrLayerName(inLayer).lower()
+        if schema:
+            table = '{}.{}'.format(schema, table)
+        arguments.append('-nln')
+        arguments.append(table)
         if len(ssrs) > 0:
             arguments.append('-s_srs')
             arguments.append(ssrs)