summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
authorMarcel Krems <m.krems@software-vision.eu>2013-02-12 05:13:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-20 23:33:07 +0100
commit14170bbf09d2f1fee3cf2fd8a8087f7e913839b4 (patch)
tree96d3dd2458d1e1ecb7bbd2ed2c66a684b3bffadb /src/sql
parent106316198d78e97ceaf3bd62203518bd85a45fda (diff)
QSqlError: Set error code for psql-driver.
Task-number: QTBUG-142 Change-Id: I4a68da595b7c8869188225958eaa88f789d4c3bf Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/drivers/psql/qsql_psql.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index fd5990f3ee..c052e4c2e7 100644
--- 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()