summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIsrael Lins <israelins85@yahoo.com.br>2013-03-18 02:20:55 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-24 21:57:44 (GMT)
commit37d19b88f84990cc40b11bb297dadbdb6b2c8e7a (patch)
treeee4d034b84eb6554bb5922fcf14c334f8e8016a1 /src
parent5500bdc4f18e2e5b056e8b274dfef389889a5d34 (diff)
downloadQt-37d19b88f84990cc40b11bb297dadbdb6b2c8e7a.zip
Qt-37d19b88f84990cc40b11bb297dadbdb6b2c8e7a.tar.gz
Qt-37d19b88f84990cc40b11bb297dadbdb6b2c8e7a.tar.bz2
ODBC: lost info about column metadata on SQL_NO_DATA
In reset() if SqlExecDirect returns SQL_NO_DATA the column metadata is ignored. Change-Id: I0501fa47c42754bba42b3531da59e66c696eac53 Reviewed-by: Mark Brand <mabrand@mabrand.nl> (cherry-picked from qtbase commit f9d856b3f5a4ceaeb8a5ac88aad2ad6b9e540abf) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 5ff8e97..24357d2 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -966,11 +966,6 @@ bool QODBCResult::reset (const QString& query)
return false;
}
- if(r == SQL_NO_DATA) {
- setSelect(false);
- return true;
- }
-
SQLULEN isScrollable = 0;
SQLINTEGER bufferLength;
r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, &bufferLength);