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

qgis · Feb 3, 2014 · 9ddfdd8 · 9ddfdd8
2 parents 97cd120 + da4c429
commit 9ddfdd8
Showing 1 changed file with 2 additions and 2 deletions.
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;
     }