Merge pull request #30265 from troopa81/source_missing_keyColumn

Update datasource when using postgres provider so we have the key column in it
qgis · Jun 27, 2019 · f1bd39d · f1bd39d
2 parents 7761f5f + 9c90fdf
commit f1bd39d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1636,6 +1636,9 @@ bool QgsVectorLayer::setDataProvider( QString const &provider, const QgsDataProv
 
   if ( mProviderKey == QLatin1String( "postgres" ) )
   {
+    // update datasource from data provider computed one
+    mDataSource = mDataProvider->dataSourceUri( false );
+
     QgsDebugMsgLevel( QStringLiteral( "Beautifying layer name %1" ).arg( name() ), 3 );
 
     // adjust the display name for postgres layers

diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
@@ -1101,6 +1101,14 @@ def testReadExtentOnTable(self):
 
         self.assertEqual(vl2.extent(), originalExtent)
 
+    def testDeterminePkey(self):
+        """Test primary key auto-determination"""
+
+        vl = QgsVectorLayer(self.dbconn + ' sslmode=disable srid=4326 type=POLYGON table="qgis_test"."authors" sql=', 'test', 'postgres')
+        self.assertTrue(vl.isValid())
+        self.assertTrue(vl.dataProvider().hasMetadata())
+        self.assertTrue("key='pk'" in vl.source())
+
     def testCheckPkUnicityOnView(self):
         # vector layer based on view