postgresql provider: check connection state before running PQexec (fixes

#4909)
qgis · Jan 30, 2012 · 2623920 · 2623920
1 parent 93266ac
commit 2623920
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -699,6 +699,23 @@ QString QgsPostgresConn::quotedValue( QVariant value )
 
 PGresult *QgsPostgresConn::PQexec( QString query, bool logError )
 {
+  if ( PQstatus() != CONNECTION_OK )
+  {
+    if ( logError )
+    {
+      QgsMessageLog::logMessage( tr( "Connection error: %1 returned %2 [%3]" )
+                                 .arg( query ).arg( PQstatus() ).arg( PQerrorMessage() ),
+                                 tr( "PostGIS" ) );
+    }
+    else
+    {
+      QgsDebugMsg( QString( "Connection error: %1 returned %2 [%3]" )
+                   .arg( query ).arg( PQstatus() ).arg( PQerrorMessage() ) );
+    }
+
+    return 0;
+  }
+
   QgsDebugMsgLevel( QString( "Executing SQL: %1" ).arg( query ), 3 );
   PGresult *res = ::PQexec( mConn, query.toUtf8() );