summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsqldriver
diff options
context:
space:
mode:
authorBill King <bking@trolltech.com>2009-10-13 12:00:42 +1000
committerBill King <bking@trolltech.com>2009-10-13 13:21:49 +1000
commit99e7dcf532b1c84aa64a7ab9af9a5fd14fd64033 (patch)
tree62933ef2a7afc448ecf42677536dde8f4ea398a3 /tests/auto/qsqldriver
parentbee70a74465ef837b446ef2d2309a002da5bfe30 (diff)
Fixes autotests now for MS Access via ODBC.
Diffstat (limited to 'tests/auto/qsqldriver')
-rw-r--r--tests/auto/qsqldriver/tst_qsqldriver.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/qsqldriver/tst_qsqldriver.cpp
index f463c9eba9..8fc38a7b81 100644
--- a/tests/auto/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/qsqldriver/tst_qsqldriver.cpp
@@ -160,7 +160,11 @@ void tst_QSqlDriver::record()
//check that we can't get records using incorrect tablename casing that's been quoted
rec = db.driver()->record(db.driver()->escapeIdentifier(tablename,QSqlDriver::TableName));
- if (tst_Databases::isMySQL(db) || db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QTDS") || tst_Databases::isSqlServer(db))
+ if (tst_Databases::isMySQL(db)
+ || db.driverName().startsWith("QSQLITE")
+ || db.driverName().startsWith("QTDS")
+ || tst_Databases::isSqlServer(db)
+ || tst_Databases::isMSAccess(db))
QCOMPARE(rec.count(), 4); //mysql, sqlite and tds will match
else
QCOMPARE(rec.count(), 0);
@@ -208,7 +212,11 @@ void tst_QSqlDriver::primaryIndex()
tablename = tablename.toUpper();
index = db.driver()->primaryIndex(db.driver()->escapeIdentifier(tablename, QSqlDriver::TableName));
- if (tst_Databases::isMySQL(db) || db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QTDS") || tst_Databases::isSqlServer(db))
+ if (tst_Databases::isMySQL(db)
+ || db.driverName().startsWith("QSQLITE")
+ || db.driverName().startsWith("QTDS")
+ || tst_Databases::isSqlServer(db)
+ || tst_Databases::isMSAccess(db))
QCOMPARE(index.count(), 1); //mysql will always find the table name regardless of casing
else
QCOMPARE(index.count(), 0);