Do not check primary key unicity on views when trustProject option is…

… activated
qgis · Sep 6, 2017 · b55c134 · b55c134
1 parent 4a084bf
commit b55c134
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -37,6 +37,7 @@
 #include "qgspostgrestransaction.h"
 #include "qgslogger.h"
 #include "qgsfeedback.h"
+#include "qgssettings.h"
 
 #ifdef HAVE_GUI
 #include "qgspgsourceselect.h"
@@ -1324,7 +1325,9 @@ bool QgsPostgresProvider::determinePrimaryKey()
       }
       else if ( type == Relkind::View || type == Relkind::MaterializedView )
       {
-        determinePrimaryKeyFromUriKeyColumn();
+        QgsSettings settings;
+        bool checkPrimaryKeyUnicity = !settings.value( QStringLiteral( "/qgis/trustProject" ), false ).toBool();
+        determinePrimaryKeyFromUriKeyColumn( checkPrimaryKeyUnicity );
       }
       else
       {
@@ -1453,7 +1456,7 @@ QStringList QgsPostgresProvider::parseUriKey( const QString &key )
   return cols;
 }
 
-void QgsPostgresProvider::determinePrimaryKeyFromUriKeyColumn()
+void QgsPostgresProvider::determinePrimaryKeyFromUriKeyColumn( bool checkPrimaryKeyUnicity )
 {
   QString primaryKey = mUri.keyColumn();
   mPrimaryKeyType = PktUnknown;
@@ -1485,7 +1488,11 @@ void QgsPostgresProvider::determinePrimaryKeyFromUriKeyColumn()
 
     if ( !mPrimaryKeyAttrs.isEmpty() )
     {
-      if ( mUseEstimatedMetadata || uniqueData( primaryKey ) )
+      bool unique = true;
+      if ( checkPrimaryKeyUnicity )
+        unique = uniqueData( primaryKey );
+
+      if ( mUseEstimatedMetadata || unique )
       {
         mPrimaryKeyType = PktFidMap; // Map by default
         if ( mPrimaryKeyAttrs.size() == 1 )

diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -133,7 +133,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
      * Fills mPrimaryKeyType and mPrimaryKeyAttrs
      * from mUri
      */
-    void determinePrimaryKeyFromUriKeyColumn();
+    void determinePrimaryKeyFromUriKeyColumn( bool checkPrimaryKeyUnicity = true );
 
     QgsFields fields() const override;
     QString dataComment() const override;