Find topogeometry fields in tables with a geometry/geography field

Sandro Santilli · Sandro Santilli · commit 30c08cbb8c9a · 2012-10-14T01:06:13.000+02:00
Closes bug #6510
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -306,6 +306,8 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
 
   mLayersSupported.clear();
 
+  // TODO: query topology.layer too !
+
   for ( int i = 0; i < 2; i++ )
   {
     QString gtableName, columnName;
@@ -413,17 +415,17 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
     if ( searchPublicOnly )
       sql += " AND pg_namespace.nspname='public'";
 
+    // skip columns of which we already derived information from the metadata tables
     if ( nColumns > 0 )
     {
-      // TODO: handle this for the topogeometry case
-      sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geometry_columns)";
+      sql += " AND (pg_namespace.nspname,pg_class.relname,pg_attribute.attname) NOT IN (SELECT f_table_schema,f_table_name,f_geometry_column FROM geometry_columns)";
 
       if ( nGTables > 1 )
       {
-        // TODO: handle this for the topogeometry case
-        // TODO: handle this for the geometry case ?
-        sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geography_columns)";
+        sql += " AND (pg_namespace.nspname,pg_class.relname,pg_attribute.attname) NOT IN (SELECT f_table_schema,f_table_name,f_geography_column FROM geography_columns)";
       }
+
+      // TODO: handle this for the topogeometry case (once we lookup topology.layer)
     }
 
     sql += " AND pg_class.relkind IN ('v','r')"; // only from views and relations (tables)

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,8 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP`
`306`	`306`
`307`	`307`	`mLayersSupported.clear();`
`308`	`308`
	`309`	`+ // TODO: query topology.layer too !`
	`310`	`+`
`309`	`311`	`for ( int i = 0; i < 2; i++ )`
`310`	`312`	`{`
`311`	`313`	`QString gtableName, columnName;`
`@@ -413,17 +415,17 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP`
`413`	`415`	`if ( searchPublicOnly )`
`414`	`416`	`sql += " AND pg_namespace.nspname='public'";`
`415`	`417`
	`418`	`+ // skip columns of which we already derived information from the metadata tables`
`416`	`419`	`if ( nColumns > 0 )`
`417`	`420`	`{`
`418`		`- // TODO: handle this for the topogeometry case`
`419`		`- sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geometry_columns)";`
	`421`	`+ sql += " AND (pg_namespace.nspname,pg_class.relname,pg_attribute.attname) NOT IN (SELECT f_table_schema,f_table_name,f_geometry_column FROM geometry_columns)";`
`420`	`422`
`421`	`423`	`if ( nGTables > 1 )`
`422`	`424`	`{`
`423`		`- // TODO: handle this for the topogeometry case`
`424`		`- // TODO: handle this for the geometry case ?`
`425`		`- sql += " AND (pg_namespace.nspname,pg_class.relname) NOT IN (SELECT f_table_schema,f_table_name FROM geography_columns)";`
	`425`	`+ sql += " AND (pg_namespace.nspname,pg_class.relname,pg_attribute.attname) NOT IN (SELECT f_table_schema,f_table_name,f_geography_column FROM geography_columns)";`
`426`	`426`	`}`
	`427`	`+`
	`428`	`+ // TODO: handle this for the topogeometry case (once we lookup topology.layer)`
`427`	`429`	`}`
`428`	`430`
`429`	`431`	`sql += " AND pg_class.relkind IN ('v','r')"; // only from views and relations (tables)`