Add test for setting up connection string

strk · strk · commit d4feb35aba09 · 2016-10-15T11:14:47.000+02:00
diff --git a/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py b/python/plugins/processing/algs/gdal/ogr2ogrtopostgis.py
@@ -153,19 +153,35 @@ def defineCharacteristics(self):
         self.addParameter(ParameterString(self.OPTIONS,
                                           self.tr('Additional creation options'), '', optional=True))
 
+    def getConnectionString(self):
+        host = unicode(self.getParameterValue(self.HOST))
+        port = unicode(self.getParameterValue(self.PORT))
+        user = unicode(self.getParameterValue(self.USER))
+        dbname = unicode(self.getParameterValue(self.DBNAME))
+        password = unicode(self.getParameterValue(self.PASSWORD))
+        schema = unicode(self.getParameterValue(self.SCHEMA))
+        arguments = []
+        if host:
+            arguments.append('host=' + host)
+        if port:
+            arguments.append('port=' + port)
+        if dbname:
+            arguments.append('dbname=' + dbname)
+        if password:
+            arguments.append('password=' + password)
+        if schema:
+            arguments.append('active_schema=' + schema)
+        if user:
+            arguments.append('user=' + user)
+        return GdalUtils.escapeAndJoin(arguments)
+
     def getConsoleCommands(self):
         inLayer = self.getParameterValue(self.INPUT_LAYER)
         ogrLayer = ogrConnectionString(inLayer)[1:-1]
         shapeEncoding = self.getParameterValue(self.SHAPE_ENCODING)
         ssrs = unicode(self.getParameterValue(self.S_SRS))
         tsrs = unicode(self.getParameterValue(self.T_SRS))
         asrs = unicode(self.getParameterValue(self.A_SRS))
-        host = unicode(self.getParameterValue(self.HOST))
-        port = unicode(self.getParameterValue(self.PORT))
-        user = unicode(self.getParameterValue(self.USER))
-        dbname = unicode(self.getParameterValue(self.DBNAME))
-        password = unicode(self.getParameterValue(self.PASSWORD))
-        schema = unicode(self.getParameterValue(self.SCHEMA))
         table = unicode(self.getParameterValue(self.TABLE))
         pk = unicode(self.getParameterValue(self.PK))
         pkstring = "-lco FID=" + pk
@@ -203,18 +219,7 @@ def getConsoleCommands(self):
         arguments.append('-f')
         arguments.append('PostgreSQL')
         arguments.append('PG:"')
-        if host:
-            arguments.append(' host=' + host)
-        if port:
-            arguments.append('port=' + port)
-        if dbname:
-            arguments.append('dbname=' + dbname)
-        if password:
-            arguments.append('password=' + password)
-        if schema:
-            arguments.append('active_schema=' + schema)
-        if user:
-            arguments.append('user=' + user)
+        arguments.append(self.getConnectionString())
         arguments.append('"')
         arguments.append(dimstring)
         arguments.append(ogrLayer)
diff --git a/python/plugins/processing/tests/GdalAlgorithmsTest.py b/python/plugins/processing/tests/GdalAlgorithmsTest.py
@@ -26,6 +26,7 @@
 __revision__ = ':%H$'
 
 import AlgorithmsTestBase
+from processing.algs.gdal.ogr2ogrtopostgis import Ogr2OgrToPostGis
 
 import nose2
 import shutil
@@ -54,5 +55,52 @@ def test_definition_file(self):
         return 'gdal_algorithm_tests.yaml'
 
 
+class TestGdalOgr2OgrToPostgis(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        #start_app()
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        pass
+
+    # See http://hub.qgis.org/issues/15706
+    def test_getConnectionString(self):
+
+        obj = Ogr2OgrToPostGis()
+
+        cs = obj.getConnectionString()
+        # NOTE: defaults are debatable, see
+        # https://github.com/qgis/QGIS/pull/3607#issuecomment-253971020
+        self.assertEquals(obj.getConnectionString(),
+                          "host=localhost port=5432 active_schema=public")
+
+        obj.setParameterValue('HOST', 'remote')
+        self.assertEquals(obj.getConnectionString(),
+                          "host=remote port=5432 active_schema=public")
+
+        obj.setParameterValue('HOST', '')
+        self.assertEquals(obj.getConnectionString(),
+                          "port=5432 active_schema=public")
+
+        obj.setParameterValue('PORT', '5555')
+        self.assertEquals(obj.getConnectionString(),
+                          "port=5555 active_schema=public")
+
+        obj.setParameterValue('PORT', '')
+        self.assertEquals(obj.getConnectionString(),
+                          "active_schema=public")
+
+        obj.setParameterValue('USER', 'usr')
+        self.assertEquals(obj.getConnectionString(),
+                          "active_schema=public user=usr")
+
+        obj.setParameterValue('PASSWORD', 'pwd')
+        self.assertEquals(obj.getConnectionString(),
+                          "password=pwd active_schema=public user=usr")
+
+
 if __name__ == '__main__':
     nose2.main()
