include key= field in all postgres data source uris (only for views before)

jef · jef · commit 6dece232f335 · 2009-12-08T00:53:53.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12369 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -159,8 +159,8 @@ QgsPostgresProvider::QgsPostgresProvider( QString const & uri )
   if ( mCurrentSchema == mSchemaName )
   {
     mUri.clearSchema();
-    setDataSourceUri( mUri.uri() );
   }
+
   if ( mSchemaName == "" )
     mSchemaName = mCurrentSchema;
 
@@ -250,6 +250,11 @@ QgsPostgresProvider::QgsPostgresProvider( QString const & uri )
   {
     valid = false;
   }
+  else
+  {
+    mUri.setKeyColumn( primaryKey );
+    setDataSourceUri( mUri.uri() );
+  }
 
   // Close the database connection if the layer isn't going to be loaded.
   if ( !valid )
@@ -1097,9 +1102,6 @@ QString QgsPostgresProvider::getPrimaryKey()
         // From the view columns, choose one for which the underlying
         // column is suitable for use as a key into the view.
         primaryKey = chooseViewColumn( cols );
-
-        mUri.setKeyColumn( primaryKey );
-        setDataSourceUri( mUri.uri() );
       }
     }
     else
@@ -3159,9 +3161,6 @@ QString  QgsPostgresProvider::description() const
   return POSTGRES_DESCRIPTION;
 } //  QgsPostgresProvider::description()
 
-
-
-
 /**
  * Class factory to return a pointer to a newly created
  * QgsPostgresProvider object
