Fix unreported sslmode storage from connections API

qgis · Jul 7, 2020 · 0f82482 · 0f82482
1 parent df111bf
commit 0f82482
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/core/qgsdatasourceuri.h b/src/core/qgsdatasourceuri.h
@@ -38,7 +38,7 @@ class CORE_EXPORT QgsDataSourceUri
   public:
 
     /**
-     * Available SSQL connection modes.
+     * Available SSL connection modes.
      */
     enum SslMode
     {

diff --git a/src/providers/postgres/qgspostgresproviderconnection.cpp b/src/providers/postgres/qgspostgresproviderconnection.cpp
@@ -540,7 +540,7 @@ void QgsPostgresProviderConnection::store( const QString &name ) const
   settings.setValue( "username", dsUri.username() );
   settings.setValue( "password", dsUri.password() );
   settings.setValue( "authcfg", dsUri.authConfigId() );
-  settings.setValue( "sslmode", dsUri.sslMode() );
+  settings.setEnumValue( "sslmode", dsUri.sslMode() );
 
   // From configuration
   static const QStringList configurationParameters

diff --git a/tests/src/python/test_qgsproviderconnection_postgres.py b/tests/src/python/test_qgsproviderconnection_postgres.py
@@ -24,6 +24,7 @@
     QgsCoordinateReferenceSystem,
     QgsRasterLayer,
     QgsDataSourceUri,
+    QgsSettings,
 )
 from qgis.testing import unittest
 from osgeo import gdal
@@ -69,6 +70,16 @@ def test_postgis_connections_from_uri(self):
         rl = QgsRasterLayer(conn.tableUri('qgis_test', 'Raster1'), 'r1', 'postgresraster')
         self.assertTrue(rl.isValid())
 
+    def test_sslmode_store(self):
+        """Test that sslmode is stored as a string in the settings"""
+        md = QgsProviderRegistry.instance().providerMetadata('postgres')
+        conn = md.createConnection('database=\'mydb\' username=\'myuser\' password=\'mypasswd\' sslmode=verify-ca', {})
+        conn.store('my_sslmode_test')
+        settings = QgsSettings()
+        settings.beginGroup('/PostgreSQL/connections/my_sslmode_test')
+        self.assertEqual(settings.value("sslmode"), 'SslVerifyCa')
+        self.assertEqual(settings.enumValue("sslmode", QgsDataSourceUri.SslPrefer), QgsDataSourceUri.SslVerifyCa)
+
     def test_postgis_geometry_filter(self):
         """Make sure the postgres provider only returns one matching geometry record and no polygons etc."""
         vl = QgsVectorLayer(self.postgres_conn + ' srid=4326 type=POINT table="qgis_test"."geometries_table" (geom) sql=', 'test', 'postgres')