diff options
Diffstat (limited to 'tests/auto/sql')
7 files changed, 297 insertions, 4 deletions
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp index 7bfa29ec8e..15190b0f3e 100644 --- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp +++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp @@ -54,6 +54,18 @@ private slots: void formatValue(); }; +static bool driverSupportsDefaultValues(QSqlDriver::DbmsType dbType) +{ + switch (dbType) { + case QSqlDriver::SQLite: + case QSqlDriver::PostgreSQL: + case QSqlDriver::Oracle: + return true; + default: + break; + } + return false; +} void tst_QSqlDriver::initTestCase_data() { @@ -81,8 +93,9 @@ void tst_QSqlDriver::recreateTestTables(QSqlDatabase db) doubleField = "more_data double precision"; else doubleField = "more_data double(8,7)"; + const QString defValue(driverSupportsDefaultValues(dbType) ? QStringLiteral("DEFAULT 'defaultVal'") : QString()); QVERIFY_SQL( q, exec("create table " + relTEST1 + - " (id int not null primary key, name varchar(20), title_key int, another_title_key int, " + doubleField + QLatin1Char(')'))); + " (id int not null primary key, name varchar(20) " + defValue + ", title_key int, another_title_key int, " + doubleField + QLatin1Char(')'))); QVERIFY_SQL( q, exec("insert into " + relTEST1 + " values(1, 'harry', 1, 2, 1.234567)")); QVERIFY_SQL( q, exec("insert into " + relTEST1 + " values(2, 'trond', 2, 1, 8.901234)")); QVERIFY_SQL( q, exec("insert into " + relTEST1 + " values(3, 'vohi', 1, 2, 5.678901)")); @@ -127,7 +140,7 @@ void tst_QSqlDriver::record() //check we can get records using an unquoted mixed case table name QSqlRecord rec = db.driver()->record(tablename); - QCOMPARE(rec.count(), 5); + QCOMPARE(rec.count(), fields.size()); QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); // QTBUG-1363: QSqlField::length() always return -1 when using QODBC3 driver and QSqlDatabase::record() @@ -141,6 +154,9 @@ void tst_QSqlDriver::record() for (int i = 0; i < fields.count(); ++i) QCOMPARE(rec.fieldName(i), fields[i]); + if (driverSupportsDefaultValues(dbType)) + QCOMPARE(rec.field(QStringLiteral("name")).defaultValue().toString(), QStringLiteral("defaultVal")); + if (dbType == QSqlDriver::Interbase || dbType == QSqlDriver::Oracle || dbType == QSqlDriver::DB2) tablename = tablename.toUpper(); else if (dbType == QSqlDriver::PostgreSQL) diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index c64310a715..4ce1009c90 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -180,6 +180,8 @@ private slots: void timeStampParsing(); void sqliteVirtualTable_data() { generic_data("QSQLITE"); } void sqliteVirtualTable(); + void mysql_timeType_data() { generic_data("QMYSQL"); } + void mysql_timeType(); #ifdef NOT_READY_YET void task_229811(); @@ -4722,5 +4724,58 @@ void tst_QSqlQuery::sqliteVirtualTable() QCOMPARE(qry.value(1).toString(), "Peter"); } +void tst_QSqlQuery::mysql_timeType() +{ + // The TIME data type is different to the standard with MySQL as it has a range of + // '-838:59:59' to '838:59:59'. + QFETCH(QString, dbName); + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + const auto tableName = qTableName("mysqlTimeType", __FILE__, db); + tst_Databases::safeDropTables(db, { tableName }); + QSqlQuery qry(db); + QVERIFY_SQL(qry, exec("create table " + tableName + " (t time(6))")); + + // MySQL will convert days into hours and add them together so 17 days 11 hours becomes 419 hours + const QStringList timeData = { "-838:59:59.000000", "-123:45:56.789", "000:00:00.0", "123:45:56.789", + "838:59:59.000000", "15:50", "12", "1213", "0 1:2:3", "17 11:22:33" }; + const QStringList resultTimeData = { "-838:59:59.000000", "-123:45:56.789000", "00:00:00.000000", + "123:45:56.789000", "838:59:59.000000", "15:50:00.000000", "00:00:12.000000", "00:12:13.000000", + "01:02:03.000000", "419:22:33.000000" }; + for (const QString &time : timeData) + QVERIFY_SQL(qry, exec("insert into " + tableName + " (t) VALUES ('" + time + "')")); + + QVERIFY_SQL(qry, exec("select * from " + tableName)); + for (const QString &time : qAsConst(resultTimeData)) { + QVERIFY(qry.next()); + QCOMPARE(qry.value(0).toString(), time); + } + + QVERIFY_SQL(qry, exec("delete from " + tableName)); + for (const QString &time : timeData) { + QVERIFY_SQL(qry, prepare("insert into " + tableName + " (t) VALUES (:time)")); + qry.bindValue(0, time); + QVERIFY_SQL(qry, exec()); + } + QVERIFY_SQL(qry, exec("select * from " + tableName)); + for (const QString &time : resultTimeData) { + QVERIFY(qry.next()); + QCOMPARE(qry.value(0).toString(), time); + } + + QVERIFY_SQL(qry, exec("delete from " + tableName)); + const QList<QTime> qTimeBasedData = { QTime(), QTime(1, 2, 3, 4), QTime(0, 0, 0, 0), QTime(23,59,59,999) }; + for (const QTime &time : qTimeBasedData) { + QVERIFY_SQL(qry, prepare("insert into " + tableName + " (t) VALUES (:time)")); + qry.bindValue(0, time); + QVERIFY_SQL(qry, exec()); + } + QVERIFY_SQL(qry, exec("select * from " + tableName)); + for (const QTime &time : qTimeBasedData) { + QVERIFY(qry.next()); + QCOMPARE(qry.value(0).toTime(), time); + } +} + QTEST_MAIN( tst_QSqlQuery ) #include "tst_qsqlquery.moc" diff --git a/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro b/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro index 2e4c3f998d..5c567ad771 100644 --- a/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro +++ b/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro @@ -6,5 +6,3 @@ QT = core core-private sql sql-private testlib SOURCES += tst_qsqlresult.cpp HEADERS += testsqldriver.h -mingw: LIBS += -lws2_32 - diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp index 5482dc393b..09a842eb83 100644 --- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp +++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp @@ -401,8 +401,10 @@ void tst_QSqlThread::readWriteThreading() QTRY_VERIFY_WITH_TIMEOUT(threadFinishedCount >= 2, 10000); } +#ifdef QOCI_THREADED // run with n threads in parallel. Change this constant to hammer the poor DB server even more static const int maxThreadCount = 4; +#endif void tst_QSqlThread::readFromSingleConnection() { diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/qsqlrelationaldelegate.pro b/tests/auto/sql/models/qsqlrelationaldelegate/qsqlrelationaldelegate.pro new file mode 100644 index 0000000000..d911a46259 --- /dev/null +++ b/tests/auto/sql/models/qsqlrelationaldelegate/qsqlrelationaldelegate.pro @@ -0,0 +1,5 @@ +CONFIG += testcase +TARGET = tst_qsqlrelationaldelegate +SOURCES += tst_qsqlrelationaldelegate.cpp + +QT = core sql testlib core-private sql-private widgets diff --git a/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp b/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp new file mode 100644 index 0000000000..36f592395e --- /dev/null +++ b/tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp @@ -0,0 +1,170 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include <QtTest/QtTest> +#include <QtSql/QtSql> +#include <QTableView> +#include <QComboBox> + +#include "../../kernel/qsqldatabase/tst_databases.h" + +const QString reltest1(qTableName("reltest1", __FILE__, QSqlDatabase())), + reltest2(qTableName("reltest2", __FILE__, QSqlDatabase())); + +class tst_QSqlRelationalDelegate : public QObject +{ + Q_OBJECT + +public: + void recreateTestTables(QSqlDatabase); + + tst_Databases dbs; + +public slots: + void initTestCase_data(); + void initTestCase(); + void cleanupTestCase(); + void init(); + void cleanup(); + +private slots: + void comboBoxEditor(); +private: + void dropTestTables(QSqlDatabase db); +}; + + +void tst_QSqlRelationalDelegate::initTestCase_data() +{ + QVERIFY(dbs.open()); + if (dbs.fillTestTable() == 0) + QSKIP("No database drivers are available in this Qt configuration"); +} + +void tst_QSqlRelationalDelegate::recreateTestTables(QSqlDatabase db) +{ + dropTestTables(db); + + QSqlQuery q(db); + QVERIFY_SQL(q, exec("create table " + reltest1 + + " (id int not null primary key, name varchar(20), title_key int, another_title_key int)")); + QVERIFY_SQL(q, exec("insert into " + reltest1 + " values(1, 'harry', 1, 2)")); + QVERIFY_SQL(q, exec("insert into " + reltest1 + " values(2, 'trond', 2, 1)")); + QVERIFY_SQL(q, exec("insert into " + reltest1 + " values(3, 'vohi', 1, 2)")); + QVERIFY_SQL(q, exec("insert into " + reltest1 + " values(4, 'boris', 2, 2)")); + QVERIFY_SQL(q, exec("insert into " + reltest1 + " values(5, 'nat', NULL, NULL)")); + QVERIFY_SQL(q, exec("insert into " + reltest1 + " values(6, 'ale', NULL, 2)")); + + QVERIFY_SQL(q, exec("create table " + reltest2 + " (id int not null primary key, title varchar(20))")); + QVERIFY_SQL(q, exec("insert into " + reltest2 + " values(1, 'herr')")); + QVERIFY_SQL(q, exec("insert into " + reltest2 + " values(2, 'mister')")); +} + +void tst_QSqlRelationalDelegate::initTestCase() +{ + foreach (const QString &dbname, dbs.dbNames) { + QSqlDatabase db=QSqlDatabase::database(dbname); + QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); + if (dbType == QSqlDriver::Interbase) { + db.exec("SET DIALECT 3"); + } else if (dbType == QSqlDriver::MSSqlServer) { + db.exec("SET ANSI_DEFAULTS ON"); + db.exec("SET IMPLICIT_TRANSACTIONS OFF"); + } else if (dbType == QSqlDriver::PostgreSQL) { + db.exec("set client_min_messages='warning'"); + } + recreateTestTables(db); + } +} + +void tst_QSqlRelationalDelegate::cleanupTestCase() +{ + foreach (const QString &dbName, dbs.dbNames) { + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + dropTestTables(QSqlDatabase::database(dbName)); + } + dbs.close(); +} + +void tst_QSqlRelationalDelegate::dropTestTables(QSqlDatabase db) +{ + QStringList tableNames = { reltest1, reltest2 }; + tst_Databases::safeDropTables(db, tableNames); +} + +void tst_QSqlRelationalDelegate::init() +{ +} + +void tst_QSqlRelationalDelegate::cleanup() +{ +} + +void tst_QSqlRelationalDelegate::comboBoxEditor() +{ + QFETCH_GLOBAL(QString, dbName); + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + + QTableView tv; + QSqlRelationalTableModel model(0, db); + model.setEditStrategy(QSqlTableModel::OnManualSubmit); + model.setTable(reltest1); + model.setRelation(2, QSqlRelation(reltest2, "id", "title")); + model.setRelation(3, QSqlRelation(reltest2, "id", "title")); + tv.setModel(&model); + QVERIFY_SQL(model, select()); + + QSqlRelationalDelegate delegate; + tv.setItemDelegate(&delegate); + tv.show(); + QVERIFY(QTest::qWaitForWindowActive(&tv)); + + QModelIndex index = model.index(0, 2); + tv.setCurrentIndex(index); + tv.edit(index); + QList<QComboBox*> comboBoxes = tv.viewport()->findChildren<QComboBox *>(); + QCOMPARE(comboBoxes.count(), 1); + + QComboBox *editor = comboBoxes.at(0); + QCOMPARE(editor->currentText(), "herr"); + QTest::keyClick(editor, Qt::Key_Down); + QTest::keyClick(editor, Qt::Key_Enter); + QCOMPARE(editor->currentText(), "mister"); + QVERIFY_SQL(model, submitAll()); + + QSqlQuery qry(db); + QVERIFY_SQL(qry, exec("SELECT title_key FROM " + reltest1 + " WHERE id=1")); + QVERIFY(qry.next()); + QCOMPARE(qry.value(0).toString(), "mister"); +} + +QTEST_MAIN(tst_QSqlRelationalDelegate) +#include "tst_qsqlrelationaldelegate.moc" diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp index 430fa981d5..da31f437d9 100644 --- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp @@ -31,11 +31,29 @@ #include "../../kernel/qsqldatabase/tst_databases.h" #include <QtSql> #include <QtSql/private/qsqltablemodel_p.h> +#include <QThread> const QString test(qTableName("test", __FILE__, QSqlDatabase())), test2(qTableName("test2", __FILE__, QSqlDatabase())), test3(qTableName("test3", __FILE__, QSqlDatabase())); +// In order to catch when the warning message occurs, indicating that the database belongs to another +// thread, we have to install our own message handler. To ensure that the test reporting still happens +// as before, we call the originating one. +// +// For now, this is only called inside the modelInAnotherThread() test +QtMessageHandler oldHandler = nullptr; + +void sqlTableModelMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) +{ + if (type == QtWarningMsg && + msg == "QSqlDatabasePrivate::database: requested database does not " + "belong to the calling thread.") { + QFAIL("Requested database does not belong to the calling thread."); + } + if (oldHandler) + oldHandler(type, context, msg); +} class tst_QSqlTableModel : public QObject { @@ -116,6 +134,7 @@ private slots: void sqlite_bigTable_data() { generic_data("QSQLITE"); } void sqlite_bigTable(); + void modelInAnotherThread(); // bug specific tests void insertRecordBeforeSelect_data() { generic_data(); } @@ -276,6 +295,10 @@ void tst_QSqlTableModel::init() void tst_QSqlTableModel::cleanup() { recreateTestTables(); + if (oldHandler) { + qInstallMessageHandler(oldHandler); + oldHandler = nullptr; + } } void tst_QSqlTableModel::select() @@ -2100,5 +2123,29 @@ void tst_QSqlTableModel::invalidFilterAndHeaderData() QVERIFY(!v.isValid()); } +class SqlThread : public QThread +{ +public: + SqlThread() : QThread() {} + void run() + { + QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "non-default-connection"); + QSqlTableModel stm(nullptr, db); + isDone = true; + } + bool isDone = false; +}; + +void tst_QSqlTableModel::modelInAnotherThread() +{ + oldHandler = qInstallMessageHandler(sqlTableModelMessageHandler); + QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + CHECK_DATABASE(db); + SqlThread t; + t.start(); + QTRY_VERIFY(t.isDone); + QVERIFY(t.isFinished()); +} + QTEST_MAIN(tst_QSqlTableModel) #include "tst_qsqltablemodel.moc" |