diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 13:02:36 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-01 13:02:36 (GMT) |
| commit | 0533cd3a773952490eb0e5686afb7b235799a13f (patch) | |
| tree | a1f14fe42a51499666921d58a6a5b62f1f916d8e /src/sql | |
| parent | 9c132451acc7fbed1611fd3676cceb26e815f50d (diff) | |
| parent | e5974b024828578945bd4c349f5f87f82a635225 (diff) | |
| download | Qt-0533cd3a773952490eb0e5686afb7b235799a13f.zip Qt-0533cd3a773952490eb0e5686afb7b235799a13f.tar.gz Qt-0533cd3a773952490eb0e5686afb7b235799a13f.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.cpp | 2 | ||||
| -rw-r--r-- | src/sql/drivers/psql/qsql_psql.cpp | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 1573d02..0b534d9 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -214,7 +214,7 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode state_, &nativeCode_, 0, - NULL, + 0, &msgLen); if ((r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) && msgLen > 0) description_.resize(msgLen+1); diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index 5a32d1a..34277b3 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -1021,6 +1021,9 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from " "pg_namespace where pg_namespace.nspname = '%1') AND ").arg(schema)); break; + case QPSQLDriver::VersionUnknown: + qFatal("PSQL version is unknown"); + break; } i.exec(stmt.arg(tbl)); @@ -1110,6 +1113,9 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from " "pg_namespace where pg_namespace.nspname = '%1')").arg(schema)); break; + case QPSQLDriver::VersionUnknown: + qFatal("PSQL version is unknown"); + break; } QSqlQuery query(createResult()); |