apply #4167

jef-n · jef-n · commit a646ff6f00ff · 2012-01-12T02:09:45.000+01:00
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -409,13 +409,13 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
     if ( nColumns > 0 )
     {
       // TODO: handle this for the topogeometry case
-      sql += " AND NOT EXISTS (SELECT * FROM geometry_columns WHERE pg_namespace.nspname=f_table_schema AND pg_class.relname=f_table_name)";
+      sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geometry_columns)";
 
       if ( nGTables > 1 )
       {
         // TODO: handle this for the topogeometry case
         // TODO: handle this for the geometry case ?
-        sql += " AND NOT EXISTS (SELECT * FROM geography_columns WHERE pg_namespace.nspname=f_table_schema AND pg_class.relname=f_table_name)";
+        sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geography_columns)";
       }
     }
     else
@@ -461,7 +461,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
         layerProperty.geometryColName = column;
         layerProperty.pkCols = relkind == "v" ? pkCandidates( schema, table ) : QStringList();
         layerProperty.sql = "";
-        layerProperty.isGeography = false;	// TODO might be geography after all
+        layerProperty.isGeography = false; // TODO might be geography after all
 
         mLayersSupported << layerProperty;
         nColumns++;

Original file line number	Diff line number	Diff line change
`@@ -409,13 +409,13 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP`
`409`	`409`	`if ( nColumns > 0 )`
`410`	`410`	`{`
`411`	`411`	`// TODO: handle this for the topogeometry case`
`412`		`- sql += " AND NOT EXISTS (SELECT * FROM geometry_columns WHERE pg_namespace.nspname=f_table_schema AND pg_class.relname=f_table_name)";`
	`412`	`+ sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geometry_columns)";`
`413`	`413`
`414`	`414`	`if ( nGTables > 1 )`
`415`	`415`	`{`
`416`	`416`	`// TODO: handle this for the topogeometry case`
`417`	`417`	`// TODO: handle this for the geometry case ?`
`418`		`- sql += " AND NOT EXISTS (SELECT * FROM geography_columns WHERE pg_namespace.nspname=f_table_schema AND pg_class.relname=f_table_name)";`
	`418`	`+ sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geography_columns)";`
`419`	`419`	`}`
`420`	`420`	`}`
`421`	`421`	`else`
`@@ -461,7 +461,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP`
`461`	`461`	`layerProperty.geometryColName = column;`
`462`	`462`	`layerProperty.pkCols = relkind == "v" ? pkCandidates( schema, table ) : QStringList();`
`463`	`463`	`layerProperty.sql = "";`
`464`		`- layerProperty.isGeography = false; // TODO might be geography after all`
	`464`	`+ layerProperty.isGeography = false; // TODO might be geography after all`
`465`	`465`
`466`	`466`	`mLayersSupported << layerProperty;`
`467`	`467`	`nColumns++;`