the test for uniqueness now also works for multiple columns

Author: SebDieBln

src/providers/postgres/qgspostgresprovider.cpp

@@ -1314,12 +1314,12 @@ void QgsPostgresProvider::determinePrimaryKeyFromUriKeyColumn()
   }
 }
 
-bool QgsPostgresProvider::uniqueData( QString query, QString quotedColName )
+bool QgsPostgresProvider::uniqueData( QString query, QString quotedColNames )
 {
   Q_UNUSED( query );
-  // Check to see if the given column contains unique data
-  QString sql = QString( "SELECT count(distinct %1)=count(%1) FROM %2%3" )
-                .arg( quotedColName,
+  // Check to see if the given columns contain unique data
+  QString sql = QString( "SELECT count(distinct (%1))=count((%1)) AND bool_and((%1) IS NOT NULL) FROM %2%3" )
+                .arg( quotedColNames,
                       mQuery,
                       filterWhereClause() );
 

src/providers/postgres/qgspostgresprovider.h

@@ -456,9 +456,9 @@ class QgsPostgresProvider : public QgsVectorDataProvider
       QString mWhat;
     };
 
-    // A function that determines if the given schema.table.column
-    // contains unqiue entries
-    bool uniqueData( QString query, QString colName );
+    // A function that determines if the given columns
+    // contain unique entries
+    bool uniqueData( QString query, QString quotedColNames );
 
     int mEnabledCapabilities;