summaryrefslogtreecommitdiffstats
path: root/src/sql/drivers
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2015-11-19 15:51:29 +0100
committerMark Brand <mabrand@mabrand.nl>2015-12-09 07:32:07 +0000
commit2b1534848b368f3720d794e8270b392de3e5135c (patch)
tree1defd25f9e808a4914c96f4dad90af464cf945fb /src/sql/drivers
parenta48b8ecc9ceb203be588d4eefa8de19800b91fe3 (diff)
qsql_odbc: remove forwardOnly override
Change-Id: I243a374f8053639dcb3213478a1c65855d8613b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Diffstat (limited to 'src/sql/drivers')
-rw-r--r--src/sql/drivers/odbc/qsql_odbc.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 17bd17614d..db1e36daa2 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -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);
-}
-
////////////////////////////////////////