[processing] improved import to postgis algorithm

qgis · Jul 12, 2014 · a58e648 · a58e648
1 parent 1bf3be5
commit a58e648
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py b/python/plugins/processing/algs/qgis/ImportIntoPostGIS.py
@@ -74,7 +74,12 @@ def processAlgorithm(self, progress):
             raise GeoAlgorithmExecutionException(
                     'Wrong database connection name: ' + connection)
 
-        table = self.getParameterValue(self.TABLENAME)
+        layerUri = self.getParameterValue(self.INPUT)
+        layer = dataobjects.getObjectFromUri(layerUri)
+
+        table = self.getParameterValue(self.TABLENAME).strip()
+        if table == '':
+            table = layer.name().lower() 
         table.replace(' ', '')
         providerName = 'postgres'
 
@@ -105,8 +110,6 @@ def processAlgorithm(self, progress):
         else:
             uri.setDataSource(schema, table, geomColumn, '')
 
-        layerUri = self.getParameterValue(self.INPUT)
-        layer = dataobjects.getObjectFromUri(layerUri)
         (ret, errMsg) = QgsVectorLayerImport.importLayer(
             layer,
             uri.uri(),
@@ -139,8 +142,8 @@ def defineCharacteristics(self):
         self.addParameter(ParameterSelection(self.DATABASE, 'Database (connection name)',
                           self.DB_CONNECTIONS))
 
-        self.addParameter(ParameterString(self.SCHEMA, 'Schema (schema name)'))
-        self.addParameter(ParameterString(self.TABLENAME, 'Table to import to'
+        self.addParameter(ParameterString(self.SCHEMA, 'Schema (schema name)', 'public'))
+        self.addParameter(ParameterString(self.TABLENAME, 'Table to import to (leave blank to use layer name)'
                           ))
         self.addParameter(ParameterTableField(self.PRIMARY_KEY, 'Primary key field',
                           self.INPUT, optional=True))