Merge branch 'master' of github.com:qgis/QGIS

pcav · pcav · commit 9ddfdd8f778d · 2014-02-03T16:01:22.000+01:00
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -726,8 +726,8 @@ QString QgsPostgresConn::postgisVersion()
   mTopologyAvailable = false;
   if ( mPostgisVersionMajor > 1 )
   {
-    QgsPostgresResult result = PQexec( "SELECT count(c.oid) FROM pg_class AS c JOIN pg_namespace AS n ON c.relnamespace=n.oid WHERE n.nspname='topology' AND c.relname='topology'" );
-    if ( result.PQntuples() >= 1 )
+    QgsPostgresResult result = PQexec( "SELECT EXISTS ( SELECT c.oid FROM pg_class AS c JOIN pg_namespace AS n ON c.relnamespace=n.oid WHERE n.nspname='topology' AND c.relname='topology' )" );
+    if ( result.PQntuples() >= 1 && result.PQgetvalue(0, 0) == "t" )
     {
       mTopologyAvailable = true;
     }

Original file line number	Diff line number	Diff line change
`@@ -726,8 +726,8 @@ QString QgsPostgresConn::postgisVersion()`
`726`	`726`	`mTopologyAvailable = false;`
`727`	`727`	`if ( mPostgisVersionMajor > 1 )`
`728`	`728`	`{`
`729`		`- QgsPostgresResult result = PQexec( "SELECT count(c.oid) FROM pg_class AS c JOIN pg_namespace AS n ON c.relnamespace=n.oid WHERE n.nspname='topology' AND c.relname='topology'" );`
`730`		`- if ( result.PQntuples() >= 1 )`
	`729`	`+ QgsPostgresResult result = PQexec( "SELECT EXISTS ( SELECT c.oid FROM pg_class AS c JOIN pg_namespace AS n ON c.relnamespace=n.oid WHERE n.nspname='topology' AND c.relname='topology' )" );`
	`730`	`+ if ( result.PQntuples() >= 1 && result.PQgetvalue(0, 0) == "t" )`
`731`	`731`	`{`
`732`	`732`	`mTopologyAvailable = true;`
`733`	`733`	`}`