Add support for TopoGeometry datatype

Sandro Santilli · jef-n · commit 41de1a0045ef · 2011-11-13T16:36:21.000+01:00
(don't get too excited)
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -876,8 +876,8 @@ bool QgsPostgresProvider::getTableInfo( bool searchGeometryColumnsOnly, bool sea
                   "pg_namespace.oid=pg_class.relnamespace"
                   " and pg_attribute.attrelid = pg_class.oid"
                   " and ("
-                  " exists (select * from pg_type WHERE pg_type.oid=pg_attribute.atttypid AND pg_type.typname IN ('geometry','geography'))"
-                  " or pg_attribute.atttypid IN (select oid FROM pg_type a WHERE EXISTS (SELECT * FROM pg_type b WHERE a.typbasetype=b.oid AND b.typname IN ('geometry','geography')))"
+                  " exists (select * from pg_type WHERE pg_type.oid=pg_attribute.atttypid AND pg_type.typname IN ('geometry','geography','topogeometry'))"
+                  " or pg_attribute.atttypid IN (select oid FROM pg_type a WHERE EXISTS (SELECT * FROM pg_type b WHERE a.typbasetype=b.oid AND b.typname IN ('geometry','geography','topogeometry')))"
                   ")"
                   " and has_schema_privilege( pg_namespace.nspname, 'usage' )"
                   " and has_table_privilege( '\"' || pg_namespace.nspname || '\".\"' || pg_class.relname || '\"', 'select' )";
@@ -888,10 +888,13 @@ bool QgsPostgresProvider::getTableInfo( bool searchGeometryColumnsOnly, bool sea
 
     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)";
 
       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)";
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -876,8 +876,8 @@ bool QgsPostgresProvider::getTableInfo( bool searchGeometryColumnsOnly, bool sea`
`876`	`876`	`"pg_namespace.oid=pg_class.relnamespace"`
`877`	`877`	`" and pg_attribute.attrelid = pg_class.oid"`
`878`	`878`	`" and ("`
`879`		`- " exists (select * from pg_type WHERE pg_type.oid=pg_attribute.atttypid AND pg_type.typname IN ('geometry','geography'))"`
`880`		`- " or pg_attribute.atttypid IN (select oid FROM pg_type a WHERE EXISTS (SELECT * FROM pg_type b WHERE a.typbasetype=b.oid AND b.typname IN ('geometry','geography')))"`
	`879`	`+ " exists (select * from pg_type WHERE pg_type.oid=pg_attribute.atttypid AND pg_type.typname IN ('geometry','geography','topogeometry'))"`
	`880`	`+ " or pg_attribute.atttypid IN (select oid FROM pg_type a WHERE EXISTS (SELECT * FROM pg_type b WHERE a.typbasetype=b.oid AND b.typname IN ('geometry','geography','topogeometry')))"`
`881`	`881`	`")"`
`882`	`882`	`" and has_schema_privilege( pg_namespace.nspname, 'usage' )"`
`883`	`883`	`" and has_table_privilege( '\"' \|\| pg_namespace.nspname \|\| '\".\"' \|\| pg_class.relname \|\| '\"', 'select' )";`
`@@ -888,10 +888,13 @@ bool QgsPostgresProvider::getTableInfo( bool searchGeometryColumnsOnly, bool sea`
`888`	`888`
`889`	`889`	`if ( nColumns > 0 )`
`890`	`890`	`{`
	`891`	`+ // TODO: handle this for the topogeometry case`
`891`	`892`	`sql += " and not exists (select * from geometry_columns WHERE pg_namespace.nspname=f_table_schema AND pg_class.relname=f_table_name)";`
`892`	`893`
`893`	`894`	`if ( nGTables > 1 )`
`894`	`895`	`{`
	`896`	`+ // TODO: handle this for the topogeometry case`
	`897`	`+ // TODO: handle this for the geometry case ?`
`895`	`898`	`sql += " and not exists (select * from geography_columns WHERE pg_namespace.nspname=f_table_schema AND pg_class.relname=f_table_name)";`
`896`	`899`	`}`
`897`	`900`	`}`