postgres provider: allow detection of empty views (fixes #13638)

jef-n · jef-n · commit 441f6f8cf1c5 · 2015-10-20T14:42:45.000+02:00
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -588,9 +588,6 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
       // catalog doesn't exist in postgresql so we ignore that, but we
       // do need to get the geometry type.
 
-      // Make the assumption that the geometry type for the first
-      // row is the same as for all other rows.
-
       QString tableName  = result.PQgetvalue( i, 0 ); // relname
       QString schemaName = result.PQgetvalue( i, 1 ); // nspname
       QString column     = result.PQgetvalue( i, 2 ); // attname
@@ -601,8 +598,8 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
 
       //QgsDebugMsg( QString( "%1.%2.%3: %4" ).arg( schemaName ).arg( tableName ).arg( column ).arg( relkind ) );
 
-      layerProperty.types.clear();
-      layerProperty.srids.clear();
+      layerProperty.types = QList<QGis::WkbType>() << QGis::WKBUnknown;
+      layerProperty.srids = QList<int>() << INT_MIN;
       layerProperty.schemaName = schemaName;
       layerProperty.tableName = tableName;
       layerProperty.geometryColName = column;
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1318,7 +1318,7 @@ bool QgsPostgresProvider::uniqueData( QString query, QString quotedColNames )
 {
   Q_UNUSED( query );
   // 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" )
+  QString sql = QString( "SELECT count(distinct (%1))=count((%1)) FROM %2%3" )
                 .arg( quotedColNames,
                       mQuery,
                       filterWhereClause() );

Original file line number	Diff line number	Diff line change
`@@ -1318,7 +1318,7 @@ bool QgsPostgresProvider::uniqueData( QString query, QString quotedColNames )`
`1318`	`1318`	`{`
`1319`	`1319`	`Q_UNUSED( query );`
`1320`	`1320`	`// Check to see if the given columns contain unique data`
`1321`		`- QString sql = QString( "SELECT count(distinct (%1))=count((%1)) AND bool_and((%1) IS NOT NULL) FROM %2%3" )`
	`1321`	`+ QString sql = QString( "SELECT count(distinct (%1))=count((%1)) FROM %2%3" )`
`1322`	`1322`	`.arg( quotedColNames,`
`1323`	`1323`	`mQuery,`
`1324`	`1324`	`filterWhereClause() );`