diff options
| author | Matt Broadstone <mbroadstone@devonit.com> | 2014-09-16 10:03:14 -0400 |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2014-09-24 14:44:49 +0200 |
| commit | f84b00c6d26eb7a3a6802210d2a8b12ddbf815aa (patch) | |
| tree | d21bb67ce89e136da1ae6be66a7d005f84c0cd93 /tests/auto/sql/kernel/qsqlresult | |
| parent | eef1e51f97a652907bda29357c20388ab36f26ec (diff) | |
Expose QSqlDriverPrivate dbmsType in public QSqlDriver api
dbmsType was previously kept as a private variable in QSqlDriverPrivate,
however it's particularly useful for QODBC users.
[ChangeLog][QtSql][QSqlDriver] Add support for determining DBMS type from SQL driver.
Change-Id: If1c221520da9ac4ccef85a02db078679d76eac92
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'tests/auto/sql/kernel/qsqlresult')
| -rw-r--r-- | tests/auto/sql/kernel/qsqlresult/testsqldriver.h | 5 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h index 6dca92de94..c7889a979c 100644 --- a/tests/auto/sql/kernel/qsqlresult/testsqldriver.h +++ b/tests/auto/sql/kernel/qsqlresult/testsqldriver.h @@ -91,11 +91,6 @@ public: int /* port */, const QString & /* options */) { return false; } void close() {} - QSqlDriverPrivate::DBMSType dbmsType() const - { - Q_D(const QSqlDriver); - return d->dbmsType; - } QSqlResult *createResult() const { return new TestSqlDriverResult(this); } }; diff --git a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp index ba9b1bb593..bb293c1f55 100644 --- a/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp +++ b/tests/auto/sql/kernel/qsqlresult/tst_qsqlresult.cpp @@ -71,17 +71,17 @@ void tst_QSqlResult::parseOfBoundValues() QVERIFY(result.savePrepare("SELECT :1 AS ':2'")); QCOMPARE(result.boundValues().count(), 1); QVERIFY(result.savePrepare("SELECT :1 AS [:2]")); - if (testDriver.dbmsType() == QSqlDriverPrivate::PostgreSQL) + if (testDriver.dbmsType() == QSqlDriver::PostgreSQL) QCOMPARE(result.boundValues().count(), 2); else QCOMPARE(result.boundValues().count(), 1); QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]")); - if (testDriver.dbmsType() == QSqlDriverPrivate::PostgreSQL) + if (testDriver.dbmsType() == QSqlDriver::PostgreSQL) QCOMPARE(result.boundValues().count(), 2); else QCOMPARE(result.boundValues().count(), 1); QVERIFY(result.savePrepare("SELECT :1 AS [:2]]]]]")); - if (testDriver.dbmsType() == QSqlDriverPrivate::PostgreSQL) + if (testDriver.dbmsType() == QSqlDriver::PostgreSQL) QCOMPARE(result.boundValues().count(), 2); else QCOMPARE(result.boundValues().count(), 1); @@ -91,7 +91,7 @@ void tst_QSqlResult::parseOfBoundValues() QVERIFY(result.savePrepare("SELECT ? AS '?'")); QCOMPARE(result.boundValues().count(), 1); QVERIFY(result.savePrepare("SELECT ? AS [?]")); - if (testDriver.dbmsType() == QSqlDriverPrivate::PostgreSQL) + if (testDriver.dbmsType() == QSqlDriver::PostgreSQL) QCOMPARE(result.boundValues().count(), 2); else QCOMPARE(result.boundValues().count(), 1); |