whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qsql_odbc: remove forwardOnly override 

Change-Id: I243a374f8053639dcb3213478a1c65855d8613b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
bb10
Mark Brand 2015-11-19 15:51:29 +01:00
parent a48b8ecc9c
commit 2b1534848b
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sql/drivers/odbc/qsql_odbc.cpp
View File

@ -161,7 +161,6 @@ public:
QVariant lastInsertId() const Q_DECL_OVERRIDE;
QVariant handle() const Q_DECL_OVERRIDE;
void setForwardOnly(bool forward) Q_DECL_OVERRIDE;
protected:
bool fetchNext() Q_DECL_OVERRIDE;
@ -190,8 +189,7 @@ public:
: QSqlResultPrivate(q, db),
hStmt(0),
useSchema(false),
hasSQLFetchScroll(true),
userForwardOnly(false)
hasSQLFetchScroll(true)
{
unicode = drv_d_func()->unicode;
useSchema = drv_d_func()->useSchema;
@ -214,7 +212,6 @@ public:
int fieldCacheIdx;
int disconnectCount;
bool hasSQLFetchScroll;
bool userForwardOnly;
bool isStmtHandleValid();
void updateStmtHandleState();
@ -997,7 +994,7 @@ bool QODBCResult::reset (const QString& query)
d->updateStmtHandleState();
if (d->userForwardOnly) {
if (isForwardOnly()) {
r = SQLSetStmtAttr(d->hStmt,
SQL_ATTR_CURSOR_TYPE,
(SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
@ -1027,7 +1024,7 @@ bool QODBCResult::reset (const QString& query)
SQLULEN isScrollable = 0;
r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, 0);
if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO)
QSqlResult::setForwardOnly(isScrollable==SQL_NONSCROLLABLE);
setForwardOnly(isScrollable == SQL_NONSCROLLABLE);
SQLSMALLINT count = 0;
SQLNumResultCols(d->hStmt, &count);
@ -1345,7 +1342,7 @@ bool QODBCResult::prepare(const QString& query)
d->updateStmtHandleState();
if (d->userForwardOnly) {
if (isForwardOnly()) {
r = SQLSetStmtAttr(d->hStmt,
SQL_ATTR_CURSOR_TYPE,
(SQLPOINTER)SQL_CURSOR_FORWARD_ONLY,
@ -1658,7 +1655,7 @@ bool QODBCResult::exec()
SQLULEN isScrollable = 0;
r = SQLGetStmtAttr(d->hStmt, SQL_ATTR_CURSOR_SCROLLABLE, &isScrollable, SQL_IS_INTEGER, 0);
if(r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO)
QSqlResult::setForwardOnly(isScrollable==SQL_NONSCROLLABLE);
setForwardOnly(isScrollable == SQL_NONSCROLLABLE);
SQLSMALLINT count = 0;
SQLNumResultCols(d->hStmt, &count);
@ -1824,13 +1821,6 @@ void QODBCResult::detachFromResultSet()
SQLCloseCursor(d->hStmt);
}
void QODBCResult::setForwardOnly(bool forward)
{
Q_D(QODBCResult);
d->userForwardOnly = forward;
QSqlResult::setForwardOnly(forward);
}
////////////////////////////////////////