Improve handling of errors in the connection and query thread classes.

git-svn-id: svn://svn.pgadmin.org/trunk@6456 a7884b65-44f6-0310-8a51-81a127f17b15
pgadmin-org · Jul 18, 2007 · defbaeb · defbaeb
1 parent 310c5ba
commit defbaeb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pgadmin/db/pgConn.cpp b/pgadmin/db/pgConn.cpp
@@ -718,7 +718,12 @@ void pgConn::SetLastResultError(PGresult *res)
     lastResultError.source_line = wxString(PQresultErrorField(res, PG_DIAG_SOURCE_LINE), *conv);
     lastResultError.source_function = wxString(PQresultErrorField(res, PG_DIAG_SOURCE_FUNCTION), *conv);
 
-    wxString errMsg = lastResultError.severity + wxT(": ") + lastResultError.msg_primary;
+    wxString errMsg;
+
+    if (lastResultError.severity != wxEmptyString && lastResultError.msg_primary != wxEmptyString)
+        errMsg = lastResultError.severity + wxT(": ") + lastResultError.msg_primary;
+    else if (lastResultError.msg_primary != wxEmptyString)
+        errMsg = lastResultError.msg_primary;
 
     if (!lastResultError.sql_state.IsEmpty())
     {

diff --git a/pgadmin/db/pgQueryThread.cpp b/pgadmin/db/pgQueryThread.cpp
@@ -164,7 +164,10 @@ int pgQueryThread::execute()
         if (*s)
             rowsInserted = atol(s);
     }
-
+    else if (rc == PGRES_FATAL_ERROR)
+    {
+        appendMessage(conn->GetLastError() + wxT("\n"));
+    }
     return(1);
 }