QSqlError: Set error code for psql-driver.

Task-number: QTBUG-142 Change-Id: I4a68da595b7c8869188225958eaa88f789d4c3bf Reviewed-by: Mark Brand <[email protected]>
leapmotion · Dec 20, 2013 · 14170bb · 14170bb
1 parent 1063161
commit 14170bb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
@@ -224,11 +224,12 @@ static QSqlError qMakeError(const QString& err, QSqlError::ErrorType type,
 {
     const char *s = PQerrorMessage(p->connection);
     QString msg = p->isUtf8 ? QString::fromUtf8(s) : QString::fromLocal8Bit(s);
+    QString errorCode;
     if (result) {
-      const char *sCode = PQresultErrorField(result, PG_DIAG_SQLSTATE);
-      msg += QString::fromLatin1("(%1)").arg(QString::fromLatin1(sCode));
+      errorCode = QString::fromLatin1(PQresultErrorField(result, PG_DIAG_SQLSTATE));
+      msg += QString::fromLatin1("(%1)").arg(errorCode);
     }
-    return QSqlError(QLatin1String("QPSQL: ") + err, msg, type);
+    return QSqlError(QLatin1String("QPSQL: ") + err, msg, type, errorCode);
 }
 
 bool QPSQLResultPrivate::processResults()