diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-03-21 11:23:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 11:13:28 +0200 |
| commit | 693a399acbff14718d1a0d48b8837741f1f55ccc (patch) | |
| tree | 3dbc5ba3b253015fd5a4261f9196f27533637a65 /tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp | |
| parent | 239252d91740ec78a87926698800d13b3a849c55 (diff) | |
Fix sql tests in respect to Oracle databases
Oracle has a limitation of 30 characters for a tablename so the main
change is to account for this, which meant changing all the usages of
qTableName(). Some other fixes are included that ensure the tests are
working correctly as far as Oracle is concerned.
Change-Id: I8ad8a5a33e6a70fcad235f6a7e82e91687b74fee
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp')
| -rw-r--r-- | tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp index 852cb8f41ea..3500e26f5ec 100644 --- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp @@ -77,7 +77,7 @@ void tst_QSqlDriver::initTestCase_data() void tst_QSqlDriver::recreateTestTables(QSqlDatabase db) { QSqlQuery q(db); - const QString relTEST1(qTableName("relTEST1", __FILE__)); + const QString relTEST1(qTableName("relTEST1", __FILE__, db)); if(tst_Databases::isPostgreSQL(db)) QVERIFY_SQL( q, exec("set client_min_messages='warning'")); @@ -102,7 +102,7 @@ void tst_QSqlDriver::cleanupTestCase() { foreach (const QString &dbName, dbs.dbNames) { QSqlDatabase db = QSqlDatabase::database(dbName); - tst_Databases::safeDropTable( db, qTableName( "relTEST1", __FILE__ ) ); + tst_Databases::safeDropTable(db, qTableName("relTEST1", __FILE__, db)); } dbs.close(); } @@ -121,7 +121,7 @@ void tst_QSqlDriver::record() QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); - QString tablename(qTableName("relTEST1", __FILE__)); + QString tablename(qTableName("relTEST1", __FILE__, db)); QStringList fields; fields << "id" << "name" << "title_key" << "another_title_key"; @@ -178,7 +178,7 @@ void tst_QSqlDriver::primaryIndex() QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); - QString tablename(qTableName("relTEST1", __FILE__)); + QString tablename(qTableName("relTEST1", __FILE__, db)); //check that we can get primary index using unquoted mixed case table name QSqlIndex index = db.driver()->primaryIndex(tablename); QCOMPARE(index.count(), 1); |