FCL/sf/mw/qt: comparison tests/auto/qsqltablemodel/tst

equal deleted inserted replaced

-:41300fa6a67c
+:f7bc934e204c
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
 #include <QtTest/QtTest>
 #include "../qsqldatabase/tst_databases.h"
 #include <QtSql>
+const QString test(qTableName("test", __FILE__)),
+test2(qTableName("test2", __FILE__)),
+test3(qTableName("test3", __FILE__));
 //TESTED_CLASS=
 //TESTED_FILES=
 Q_DECLARE_METATYPE(QModelIndex)
 QSqlQuery q(db);
 if(tst_Databases::isPostgreSQL(db))
 QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
 QStringList tableNames;
-tableNames << qTableName("test")
+tableNames << test
-<< qTableName("test2")
+<< test2
-<< qTableName("test3")
+<< test3
-<< qTableName("test4")
+<< qTableName("test4", __FILE__)
-<< qTableName("emptytable")
+<< qTableName("emptytable", __FILE__)
-<< qTableName("bigtable")
+<< qTableName("bigtable", __FILE__)
-<< qTableName("foo");
+<< qTableName("foo", __FILE__);
 if (testWhiteSpaceNames(db.driverName()))
 tableNames << qTableName("qtestw hitespace", db.driver());
 tst_Databases::safeDropTables(db, tableNames);
 if (db.driverName().startsWith("QPSQL")) {
-q.exec("DROP SCHEMA " + qTableName("testschema") + " CASCADE");
+q.exec("DROP SCHEMA " + qTableName("testschema", __FILE__) + " CASCADE");
 }
 }
 }
 void tst_QSqlTableModel::createTestTables()
 {
 for (int i = 0; i < dbs.dbNames.count(); ++i) {
 QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i));
 QSqlQuery q(db);
-QVERIFY_SQL( q, exec("create table " + qTableName("test") + "(id int, name varchar(20), title int)"));
+QVERIFY_SQL( q, exec("create table " + test + "(id int, name varchar(20), title int)"));
-QVERIFY_SQL( q, exec("create table " + qTableName("test2") + "(id int, title varchar(20))"));
+QVERIFY_SQL( q, exec("create table " + test2 + "(id int, title varchar(20))"));
-QVERIFY_SQL( q, exec("create table " + qTableName("test3") + "(id int, random varchar(20), randomtwo varchar(20))"));
+QVERIFY_SQL( q, exec("create table " + test3 + "(id int, random varchar(20), randomtwo varchar(20))"));
-QVERIFY_SQL( q, exec("create table " + qTableName("test4") + "(column1 varchar(50), column2 varchar(50), column3 varchar(50))"));
+QVERIFY_SQL( q, exec("create table " + qTableName("test4", __FILE__) + "(column1 varchar(50), column2 varchar(50), column3 varchar(50))"));
-QVERIFY_SQL( q, exec("create table " + qTableName("emptytable") + "(id int)"));
+QVERIFY_SQL( q, exec("create table " + qTableName("emptytable", __FILE__) + "(id int)"));
 if (testWhiteSpaceNames(db.driverName())) {
 QString qry = "create table " + qTableName("qtestw hitespace", db.driver()) + " ("+ db.driver()->escapeIdentifier("a field", QSqlDriver::FieldName) + " int)";
 QVERIFY_SQL( q, exec(qry));
 }
 {
 for (int i = 0; i < dbs.dbNames.count(); ++i) {
 QSqlDatabase db = QSqlDatabase::database(dbs.dbNames.at(i));
 QSqlQuery q(db);
-q.exec("delete from " + qTableName("test"));
+q.exec("delete from " + test);
-QVERIFY_SQL( q, exec("insert into " + qTableName("test") + " values(1, 'harry', 1)"));
+QVERIFY_SQL( q, exec("insert into " + test + " values(1, 'harry', 1)"));
-QVERIFY_SQL( q, exec("insert into " + qTableName("test") + " values(2, 'trond', 2)"));
+QVERIFY_SQL( q, exec("insert into " + test + " values(2, 'trond', 2)"));
-QVERIFY_SQL( q, exec("insert into " + qTableName("test") + " values(3, 'vohi', 3)"));
+QVERIFY_SQL( q, exec("insert into " + test + " values(3, 'vohi', 3)"));
-q.exec("delete from " + qTableName("test2"));
+q.exec("delete from " + test2);
-QVERIFY_SQL( q, exec("insert into " + qTableName("test2") + " values(1, 'herr')"));
+QVERIFY_SQL( q, exec("insert into " + test2 + " values(1, 'herr')"));
-QVERIFY_SQL( q, exec("insert into " + qTableName("test2") + " values(2, 'mister')"));
+QVERIFY_SQL( q, exec("insert into " + test2 + " values(2, 'mister')"));
-q.exec("delete from " + qTableName("test3"));
+q.exec("delete from " + test3);
-QVERIFY_SQL( q, exec("insert into " + qTableName("test3") + " values(1, 'foo', 'bar')"));
+QVERIFY_SQL( q, exec("insert into " + test3 + " values(1, 'foo', 'bar')"));
-QVERIFY_SQL( q, exec("insert into " + qTableName("test3") + " values(2, 'baz', 'joe')"));
+QVERIFY_SQL( q, exec("insert into " + test3 + " values(2, 'baz', 'joe')"));
 }
 }
 void tst_QSqlTableModel::recreateTestTables()
 {
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 3);
 QCOMPARE(model.columnCount(), 3);
 QString Xsuffix;
 foreach( QSqlTableModel::EditStrategy submitpolicy, policies) {
 QSqlTableModel model(0, db);
 model.setEditStrategy((QSqlTableModel::EditStrategy)submitpolicy);
-model.setTable(qTableName("test3"));
+model.setTable(test3);
 model.setSort(0, Qt::AscendingOrder);
 QVERIFY_SQL(model, select());
 for (int i = 0; i < model.rowCount(); ++i) {
 QSignalSpy spy(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex)));
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
 model.setEditStrategy(QSqlTableModel::OnRowChange);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 QVERIFY_SQL(model, select());
 QVERIFY(model.insertRow(2));
 QSqlRecord rec = model.record(1);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 QVERIFY_SQL(model, select());
 QSqlRecord rec = model.record();
 rec.setValue(0, 42);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 3);
 QVERIFY(model.setData(model.index(4, 1), QVariant(QLatin1String("gunnar"))));
 QVERIFY(model.setData(model.index(4, 2), QVariant(1)));
 QVERIFY(model.submitAll());
 model.clear();
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
 QCOMPARE(model.data(model.index(1, 0)).toInt(), 2);
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 QVERIFY_SQL(model, select());
 QVERIFY(model.setData(model.index(0, 1), "harry2", Qt::EditRole));
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 3);
 QCOMPARE(model.data(model.index(1, 0)).toInt(), 3);
 model.clear();
 recreateTestTables();
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setEditStrategy(QSqlTableModel::OnRowChange);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 3);
 headerDataChangedSpy.clear();
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 model.setEditStrategy(QSqlTableModel::OnFieldChange);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 3);
 QCOMPARE(model.rowCount(), 1);
 QCOMPARE(model.data(model.index(0, 1)).toString(), QString("vohi"));
 model.clear();
 recreateTestTables();
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 3);
 beforeDeleteSpy.clear();
 CHECK_DATABASE(db);
 for (int i = 0; i <= 1; ++i) {
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setSort(0, Qt::AscendingOrder);
 model.setEditStrategy(i == 0
 ? QSqlTableModel::OnRowChange : QSqlTableModel::OnManualSubmit);
 QVERIFY_SQL(model, select());
 QSqlTableModel model(0, db);
 QCOMPARE(model.rowCount(), 0);
 QCOMPARE(model.columnCount(), 0);
-model.setTable(qTableName("emptytable"));
+model.setTable(qTableName("emptytable", __FILE__));
 QCOMPARE(model.rowCount(), 0);
 QCOMPARE(model.columnCount(), 1);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 0);
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlQuery q(db);
-q.exec("DROP SCHEMA " + qTableName("testschema") + " CASCADE");
+q.exec("DROP SCHEMA " + qTableName("testschema", __FILE__) + " CASCADE");
-QVERIFY_SQL( q, exec("create schema " + qTableName("testschema")));
+QVERIFY_SQL( q, exec("create schema " + qTableName("testschema", __FILE__)));
-QString tableName = qTableName("testschema") + '.' + qTableName("testtable");
+QString tableName = qTableName("testschema", __FILE__) + '.' + qTableName("testtable", __FILE__);
 QVERIFY_SQL( q, exec("create table " + tableName + "(id int)"));
 QVERIFY_SQL( q, exec("insert into " + tableName + " values(1)"));
 QVERIFY_SQL( q, exec("insert into " + tableName + " values(2)"));
 QSqlTableModel model(0, db);
 QSqlQuery q(db);
 if(tst_Databases::isPostgreSQL(db))
 QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
-QVERIFY_SQL( q, exec("create table "+qTableName("foo")+"(a varchar(20), id int not null primary key, b varchar(20))"));
+QVERIFY_SQL( q, exec("create table "+qTableName("foo", __FILE__)+"(a varchar(20), id int not null primary key, b varchar(20))"));
 QSqlTableModel model(0, db);
-model.setTable(qTableName("foo"));
+model.setTable(qTableName("foo", __FILE__));
 QSqlIndex pk = model.primaryKey();
 QCOMPARE(pk.count(), 1);
 QCOMPARE(pk.fieldName(0), QLatin1String("id"));
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 // set an invalid filter, make sure it fails
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setFilter("blahfahsel");
 QCOMPARE(model.filter(), QString("blahfahsel"));
 QVERIFY(!model.select());
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setFilter("id = 1");
 QCOMPARE(model.filter(), QString("id = 1"));
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 1);
 void tst_QSqlTableModel::sqlite_bigTable()
 {
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
+const QString bigtable(qTableName("bigtable", __FILE__));
 bool hasTransactions = db.driver()->hasFeature(QSqlDriver::Transactions);
 if (hasTransactions) QVERIFY(db.transaction());
 QSqlQuery q(db);
-QVERIFY_SQL( q, exec("create table "+qTableName("bigtable")+"(id int primary key, name varchar)"));
+QVERIFY_SQL( q, exec("create table "+bigtable+"(id int primary key, name varchar)"));
-QVERIFY_SQL( q, prepare("insert into "+qTableName("bigtable")+"(id, name) values (?, ?)"));
+QVERIFY_SQL( q, prepare("insert into "+bigtable+"(id, name) values (?, ?)"));
 QTime startTime;
 startTime.start();
 for (int i = 0; i < 10000; ++i) {
 q.addBindValue(i);
 q.addBindValue(QString::number(i));
 }
 q.clear();
 if (hasTransactions) QVERIFY(db.commit());
 QSqlTableModel model(0, db);
-model.setTable(qTableName("bigtable"));
+model.setTable(bigtable);
 QVERIFY_SQL(model, select());
 QSqlRecord rec = model.record();
 rec.setValue("id", 424242);
 rec.setValue("name", "Guillaume");
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 QCOMPARE(model.lastError().type(), QSqlError::NoError);
 QSqlRecord buffer = model.record();
 buffer.setValue("id", 13);
 buffer.setValue("name", QString("The Lion King"));
 int rowCount = model.rowCount();
 model.clear();
 QCOMPARE(model.rowCount(), 0);
 QSqlTableModel model2(0, db);
-model2.setTable(qTableName("test"));
+model2.setTable(test);
 QVERIFY_SQL(model2, select());
 QCOMPARE(model2.rowCount(), rowCount);
 }
 // For task 118547: set errors if table doesn't exist and if records
 QSqlTableModel model(0, db);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 // setTable returns a void, so the error can only be caught by
 // manually checking lastError(). ### Qt5: This should be changed!
-model.setTable(qTableName("invalidTable"));
+model.setTable(qTableName("invalidTable", __FILE__));
 QCOMPARE(model.lastError().type(), QSqlError::StatementError);
 // This will give us an empty record which is expected behavior
 QSqlRecord buffer = model.record();
 buffer.setValue("bogus", 1000);
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 model.select();
 QSqlRecord record = model.record();
 record.setValue(0, 10);
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test4"));
+model.setTable(qTableName("test4", __FILE__));
 model.select();
 //generate a time stamp for the test. Add one second to the current time to make sure
 //it is different than the QSqlQuery test.
 QString timeString=QDateTime::currentDateTime().addSecs(1).toString(Qt::ISODate);
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 QVERIFY_SQL(model, select());
 QCOMPARE(model.rowCount(), 3);
 QCOMPARE(model.columnCount(), 3);
 QCOMPARE(model.columnCount(), 2);
 // check with another table because the model has been modified
 // but not the sql table
 QSqlTableModel model2(0, db);
-model2.setTable(qTableName("test"));
+model2.setTable(test);
 QVERIFY_SQL(model2, select());
 QCOMPARE(model2.rowCount(), 2);
 QCOMPARE(model2.columnCount(), 3);
 }
 QFETCH(QString, dbName);
 QSqlDatabase db = QSqlDatabase::database(dbName);
 CHECK_DATABASE(db);
 QSqlQuery q(db);
-QVERIFY_SQL( q, exec("insert into " + qTableName("test") + " values(9, 'andrew', 9)"));
+QVERIFY_SQL( q, exec("insert into " + test + " values(9, 'andrew', 9)"));
-QVERIFY_SQL( q, exec("insert into " + qTableName("test") + " values(10, 'justin', 10)"));
+QVERIFY_SQL( q, exec("insert into " + test + " values(10, 'justin', 10)"));
 QSqlTableModel model(0, db);
-model.setTable(qTableName("test"));
+model.setTable(test);
 model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 QVERIFY_SQL(model, select());
 QSqlRecord rec = model.record();
 rec.setValue(0, 4);

changeset 7	f7bc934e204c
parent 0	1918ee327afb