diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-10 01:24:00 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-10 01:24:00 (GMT) |
| commit | e80bf6e16bb894a0856029d8435f65bf2dfdc0b7 (patch) | |
| tree | bdc8ecc2d774db66a3bf3101dfec6ec90411d952 | |
| parent | e75b6b8ff49e20f1e0e48254b2180accce197caf (diff) | |
| parent | 6951212ff053ce1eee458d364896ab2e05d8ab05 (diff) | |
| download | Qt-e80bf6e16bb894a0856029d8435f65bf2dfdc0b7.zip Qt-e80bf6e16bb894a0856029d8435f65bf2dfdc0b7.tar.gz Qt-e80bf6e16bb894a0856029d8435f65bf2dfdc0b7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | tests/auto/qsqldriver/tst_qsqldriver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/qsqldriver/tst_qsqldriver.cpp index a10bd14..f463c9e 100644 --- a/tests/auto/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/qsqldriver/tst_qsqldriver.cpp @@ -160,7 +160,7 @@ 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")) + if (tst_Databases::isMySQL(db) || db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QTDS") || tst_Databases::isSqlServer(db)) QCOMPARE(rec.count(), 4); //mysql, sqlite and tds will match else QCOMPARE(rec.count(), 0); @@ -208,7 +208,7 @@ 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")) + if (tst_Databases::isMySQL(db) || db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QTDS") || tst_Databases::isSqlServer(db)) QCOMPARE(index.count(), 1); //mysql will always find the table name regardless of casing else QCOMPARE(index.count(), 0); |