qt 6.5.1 original

tests/auto/sql/models/CMakeLists.txt

@@ -0,0 +1,9 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+add_subdirectory(qsqlrelationaltablemodel)
+add_subdirectory(qsqltablemodel)
+if(TARGET Qt::Widgets)
+    add_subdirectory(qsqlquerymodel)
+    add_subdirectory(qsqlrelationaldelegate)
+endif()

tests/auto/sql/models/qsqlquerymodel/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qsqlquerymodel Test:
+#####################################################################
+
+qt_internal_add_test(tst_qsqlquerymodel
+    SOURCES
+        tst_qsqlquerymodel.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::Sql
+        Qt::SqlPrivate
+        Qt::Widgets
+)

tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp

@@ -0,0 +1,665 @@
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+
+#include <QTest>
+#include <QtGui>
+#include <QtWidgets>
+#include <QSignalSpy>
+
+#include <qsqldriver.h>
+#include <qsqldatabase.h>
+#include <qsqlerror.h>
+#include <qsqlfield.h>
+#include <qsqlquery.h>
+#include <qsqlrecord.h>
+
+#include <qsqlquerymodel.h>
+#include <qsortfilterproxymodel.h>
+
+#include "../../kernel/qsqldatabase/tst_databases.h"
+
+Q_DECLARE_METATYPE(Qt::Orientation)
+
+class tst_QSqlQueryModel : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QSqlQueryModel();
+    virtual ~tst_QSqlQueryModel();
+
+public slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+private slots:
+    void insertColumn_data() { generic_data(); }
+    void insertColumn();
+    void removeColumn_data() { generic_data(); }
+    void removeColumn();
+    void record_data() { generic_data(); }
+    void record();
+    void setHeaderData_data() { generic_data(); }
+    void setHeaderData();
+    void fetchMore_data() { generic_data(); }
+    void fetchMore();
+
+    //problem specific tests
+    void withSortFilterProxyModel_data() { generic_data(); }
+    void withSortFilterProxyModel();
+    void setQuerySignalEmission_data() { generic_data(); }
+    void setQuerySignalEmission();
+    void setQueryWithNoRowsInResultSet_data() { generic_data(); }
+    void setQueryWithNoRowsInResultSet();
+    void nestedResets_data() { generic_data(); }
+    void nestedResets();
+
+    void task_180617();
+    void task_180617_data() { generic_data(); }
+    void task_QTBUG_4963_setHeaderDataWithProxyModel();
+
+private:
+    void generic_data(const QString &engine=QString());
+    void dropTestTables(QSqlDatabase db);
+    void createTestTables(QSqlDatabase db);
+    void populateTestTables(QSqlDatabase db);
+    tst_Databases dbs;
+};
+
+/* Stupid class that makes protected members public for testing */
+class DBTestModel: public QSqlQueryModel
+{
+public:
+    DBTestModel(QObject *parent = nullptr): QSqlQueryModel(parent) {}
+    QModelIndex indexInQuery(const QModelIndex &item) const override { return QSqlQueryModel::indexInQuery(item); }
+};
+
+tst_QSqlQueryModel::tst_QSqlQueryModel()
+{
+}
+
+tst_QSqlQueryModel::~tst_QSqlQueryModel()
+{
+}
+
+void tst_QSqlQueryModel::initTestCase()
+{
+    QVERIFY(dbs.open());
+    for (QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it) {
+        QSqlDatabase db = QSqlDatabase::database((*it));
+        CHECK_DATABASE(db);
+        dropTestTables(db); //in case of leftovers
+        createTestTables(db);
+        populateTestTables(db);
+    }
+}
+
+void tst_QSqlQueryModel::cleanupTestCase()
+{
+    for (QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it) {
+        QSqlDatabase db = QSqlDatabase::database((*it));
+        CHECK_DATABASE(db);
+        dropTestTables(db);
+    }
+    dbs.close();
+}
+
+void tst_QSqlQueryModel::dropTestTables(QSqlDatabase db)
+{
+    QStringList tableNames;
+    tableNames << qTableName("test", __FILE__, db)
+            << qTableName("test2", __FILE__, db)
+            << qTableName("test3", __FILE__, db)
+            << qTableName("many", __FILE__, db);
+    tst_Databases::safeDropTables(db, tableNames);
+}
+
+void tst_QSqlQueryModel::createTestTables(QSqlDatabase db)
+{
+    dropTestTables(db);
+    QSqlQuery q(db);
+    QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
+    if (dbType == QSqlDriver::PostgreSQL)
+        QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
+    QVERIFY_SQL( q, exec("create table " + qTableName("test", __FILE__, db) + "(id integer not null, name varchar(20), title integer, primary key (id))"));
+    QVERIFY_SQL( q, exec("create table " + qTableName("test2", __FILE__, db) + "(id integer not null, title varchar(20), primary key (id))"));
+    QVERIFY_SQL( q, exec("create table " + qTableName("test3", __FILE__, db) + "(id integer not null, primary key (id))"));
+    QVERIFY_SQL( q, exec("create table " + qTableName("many", __FILE__, db) + "(id integer not null, name varchar(20), primary key (id))"));
+}
+
+void tst_QSqlQueryModel::populateTestTables(QSqlDatabase db)
+{
+    qWarning() << "Populating test tables, this can take quite a while... ZZZzzz...";
+    bool hasTransactions = db.driver()->hasFeature(QSqlDriver::Transactions);
+
+    QSqlQuery q(db), q2(db);
+
+    tst_Databases::safeDropTables(db, QStringList() << qTableName("manytmp", __FILE__, db) << qTableName("test3tmp", __FILE__, db));
+    QVERIFY_SQL(q, exec("create table " + qTableName("manytmp", __FILE__, db) + "(id integer not null, name varchar(20), primary key (id))"));
+    QVERIFY_SQL(q, exec("create table " + qTableName("test3tmp", __FILE__, db) + "(id integer not null, primary key (id))"));
+
+    if (hasTransactions) QVERIFY_SQL(db, transaction());
+
+    QVERIFY_SQL(q, exec("insert into " + qTableName("test", __FILE__, db) + " values(1, 'harry', 1)"));
+    QVERIFY_SQL(q, exec("insert into " + qTableName("test", __FILE__, db) + " values(2, 'trond', 2)"));
+    QVERIFY_SQL(q, exec("insert into " + qTableName("test2", __FILE__, db) + " values(1, 'herr')"));
+    QVERIFY_SQL(q, exec("insert into " + qTableName("test2", __FILE__, db) + " values(2, 'mister')"));
+
+    QVERIFY_SQL(q, exec(QString("insert into " + qTableName("test3", __FILE__, db) + " values(0)")));
+    QVERIFY_SQL(q, prepare("insert into "+ qTableName("test3", __FILE__, db) + "(id) select id + ? from " + qTableName("test3tmp", __FILE__, db)));
+    for (int i=1; i<260; i*=2) {
+        q2.exec("delete from " + qTableName("test3tmp", __FILE__, db));
+        QVERIFY_SQL(q2, exec("insert into " + qTableName("test3tmp", __FILE__, db) + "(id) select id from " + qTableName("test3", __FILE__, db)));
+        q.bindValue(0, i);
+        QVERIFY_SQL(q, exec());
+    }
+
+    QVERIFY_SQL(q, exec(QString("insert into " + qTableName("many", __FILE__, db) + "(id, name) values (0, \'harry\')")));
+    QVERIFY_SQL(q, prepare("insert into " + qTableName("many", __FILE__, db) + "(id, name) select id + ?, name from " + qTableName("manytmp", __FILE__, db)));
+    for (int i=1; i < 2048; i*=2) {
+        q2.exec("delete from " + qTableName("manytmp", __FILE__, db));
+        QVERIFY_SQL(q2, exec("insert into " + qTableName("manytmp", __FILE__, db) + "(id, name) select id, name from " + qTableName("many", __FILE__, db)));
+        q.bindValue(0, i);
+        QVERIFY_SQL(q, exec());
+    }
+
+    if (hasTransactions) QVERIFY_SQL(db, commit());
+
+    tst_Databases::safeDropTables(db, QStringList() << qTableName("manytmp", __FILE__, db) << qTableName("test3tmp", __FILE__, db));
+}
+
+void tst_QSqlQueryModel::generic_data(const QString& engine)
+{
+    if ( dbs.fillTestTable(engine) == 0 ) {
+        if(engine.isEmpty())
+           QSKIP( "No database drivers are available in this Qt configuration");
+        else
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
+    }
+}
+
+void tst_QSqlQueryModel::init()
+{
+}
+
+void tst_QSqlQueryModel::cleanup()
+{
+}
+
+void tst_QSqlQueryModel::removeColumn()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    DBTestModel model;
+    model.setQuery(QSqlQuery("select * from " + qTableName("test", __FILE__, db), db));
+    model.fetchMore();
+    QSignalSpy spy(&model, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)));
+
+    QCOMPARE(model.columnCount(), 3);
+    QVERIFY(model.removeColumn(0));
+    QCOMPARE(spy.size(), 1);
+    QVERIFY(*(QModelIndex *)spy.at(0).at(0).constData() == QModelIndex());
+    QCOMPARE(spy.at(0).at(1).toInt(), 0);
+    QCOMPARE(spy.at(0).at(2).toInt(), 0);
+
+    QCOMPARE(model.columnCount(), 2);
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), 2);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), -1);
+
+    QVERIFY(model.insertColumn(1));
+    QCOMPARE(model.columnCount(), 3);
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), 2);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), -1);
+
+    QCOMPARE(model.data(model.index(0, 0)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 1)), QVariant());
+    QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 3)), QVariant());
+
+    QVERIFY(!model.removeColumn(42));
+    QVERIFY(!model.removeColumn(3));
+    QVERIFY(!model.removeColumn(1, model.index(1, 2)));
+    QCOMPARE(model.columnCount(), 3);
+
+    QVERIFY(model.removeColumn(2));
+
+    QCOMPARE(spy.size(), 2);
+    QVERIFY(*(QModelIndex *)spy.at(1).at(0).constData() == QModelIndex());
+    QCOMPARE(spy.at(1).at(1).toInt(), 2);
+    QCOMPARE(spy.at(1).at(2).toInt(), 2);
+
+    QCOMPARE(model.columnCount(), 2);
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), -1);
+
+    QVERIFY(model.removeColumn(1));
+
+    QCOMPARE(spy.size(), 3);
+    QVERIFY(*(QModelIndex *)spy.at(2).at(0).constData() == QModelIndex());
+    QCOMPARE(spy.at(2).at(1).toInt(), 1);
+    QCOMPARE(spy.at(2).at(2).toInt(), 1);
+
+    QCOMPARE(model.columnCount(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), -1);
+    QCOMPARE(model.data(model.index(0, 0)).toString(), QString("harry"));
+
+    QVERIFY(model.removeColumn(0));
+
+    QCOMPARE(spy.size(), 4);
+    QVERIFY(*(QModelIndex *)spy.at(3).at(0).constData() == QModelIndex());
+    QCOMPARE(spy.at(3).at(1).toInt(), 0);
+    QCOMPARE(spy.at(3).at(2).toInt(), 0);
+
+    QCOMPARE(model.columnCount(), 0);
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), -1);
+}
+
+void tst_QSqlQueryModel::insertColumn()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
+
+    DBTestModel model;
+    model.setQuery(QSqlQuery("select * from " + qTableName("test", __FILE__, db), db));
+    model.fetchMore(); // necessary???
+
+    bool isToUpper = (dbType == QSqlDriver::Interbase) || (dbType == QSqlDriver::Oracle) || (dbType == QSqlDriver::DB2);
+    const QString idColumn(isToUpper ? "ID" : "id");
+    const QString nameColumn(isToUpper ? "NAME" : "name");
+    const QString titleColumn(isToUpper ? "TITLE" : "title");
+
+    QSignalSpy spy(&model, SIGNAL(columnsInserted(QModelIndex,int,int)));
+
+    QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 3)), QVariant());
+
+    QCOMPARE(model.headerData(0, Qt::Horizontal).toString(), idColumn);
+    QCOMPARE(model.headerData(1, Qt::Horizontal).toString(), nameColumn);
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), titleColumn);
+    QCOMPARE(model.headerData(3, Qt::Horizontal).toString(), QString("4"));
+
+    QVERIFY(model.insertColumn(1));
+
+    QCOMPARE(spy.size(), 1);
+    QVERIFY(*(QModelIndex *)spy.at(0).at(0).constData() == QModelIndex());
+    QCOMPARE(spy.at(0).at(1).toInt(), 1);
+    QCOMPARE(spy.at(0).at(2).toInt(), 1);
+
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), 0);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), 2);
+    QCOMPARE(model.indexInQuery(model.index(0, 4)).column(), -1);
+
+    QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 1)), QVariant());
+    QCOMPARE(model.data(model.index(0, 2)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 3)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 4)), QVariant());
+
+    QCOMPARE(model.headerData(0, Qt::Horizontal).toString(), idColumn);
+    QCOMPARE(model.headerData(1, Qt::Horizontal).toString(), QString("2"));
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), nameColumn);
+    QCOMPARE(model.headerData(3, Qt::Horizontal).toString(), titleColumn);
+    QCOMPARE(model.headerData(4, Qt::Horizontal).toString(), QString("5"));
+
+    QVERIFY(!model.insertColumn(-1));
+    QVERIFY(!model.insertColumn(100));
+    QVERIFY(!model.insertColumn(1, model.index(1, 1)));
+
+    QVERIFY(model.insertColumn(0));
+
+    QCOMPARE(spy.size(), 2);
+    QVERIFY(*(QModelIndex *)spy.at(1).at(0).constData() == QModelIndex());
+    QCOMPARE(spy.at(1).at(1).toInt(), 0);
+    QCOMPARE(spy.at(1).at(2).toInt(), 0);
+
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), 0);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 4)).column(), 2);
+    QCOMPARE(model.indexInQuery(model.index(0, 5)).column(), -1);
+
+    QVERIFY(!model.insertColumn(6));
+    QVERIFY(model.insertColumn(5));
+
+    QCOMPARE(spy.size(), 3);
+    QVERIFY(*(QModelIndex *)spy.at(2).at(0).constData() == QModelIndex());
+    QCOMPARE(spy.at(2).at(1).toInt(), 5);
+    QCOMPARE(spy.at(2).at(2).toInt(), 5);
+
+    QCOMPARE(model.indexInQuery(model.index(0, 0)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 1)).column(), 0);
+    QCOMPARE(model.indexInQuery(model.index(0, 2)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 3)).column(), 1);
+    QCOMPARE(model.indexInQuery(model.index(0, 4)).column(), 2);
+    QCOMPARE(model.indexInQuery(model.index(0, 5)).column(), -1);
+    QCOMPARE(model.indexInQuery(model.index(0, 6)).column(), -1);
+
+    QCOMPARE(model.record().field(0).name(), QString());
+    QCOMPARE(model.record().field(1).name(), idColumn);
+    QCOMPARE(model.record().field(2).name(), QString());
+    QCOMPARE(model.record().field(3).name(), nameColumn);
+    QCOMPARE(model.record().field(4).name(), titleColumn);
+    QCOMPARE(model.record().field(5).name(), QString());
+    QCOMPARE(model.record().field(6).name(), QString());
+
+    QCOMPARE(model.headerData(0, Qt::Horizontal).toString(), QString("1"));
+    QCOMPARE(model.headerData(1, Qt::Horizontal).toString(), idColumn);
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), QString("3"));
+    QCOMPARE(model.headerData(3, Qt::Horizontal).toString(), nameColumn);
+    QCOMPARE(model.headerData(4, Qt::Horizontal).toString(), titleColumn);
+    QCOMPARE(model.headerData(5, Qt::Horizontal).toString(), QString("6"));
+    QCOMPARE(model.headerData(6, Qt::Horizontal).toString(), QString("7"));
+}
+
+void tst_QSqlQueryModel::record()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
+
+    QSqlQueryModel model;
+    model.setQuery(QSqlQuery("select * from " + qTableName("test", __FILE__, db), db));
+
+    QSqlRecord rec = model.record();
+
+    bool isToUpper = (dbType == QSqlDriver::Interbase) || (dbType == QSqlDriver::Oracle) || (dbType == QSqlDriver::DB2);
+
+    QCOMPARE(rec.count(), 3);
+    QCOMPARE(rec.fieldName(0), isToUpper ? QString("ID") : QString("id"));
+    QCOMPARE(rec.fieldName(1), isToUpper ? QString("NAME") : QString("name"));
+    QCOMPARE(rec.fieldName(2), isToUpper ? QString("TITLE") : QString("title"));
+    QCOMPARE(rec.value(0), QVariant(rec.field(0).metaType()));
+    QCOMPARE(rec.value(1), QVariant(rec.field(1).metaType()));
+    QCOMPARE(rec.value(2), QVariant(rec.field(2).metaType()));
+
+    rec = model.record(0);
+    QCOMPARE(rec.fieldName(0), isToUpper ? QString("ID") : QString("id"));
+    QCOMPARE(rec.fieldName(1), isToUpper ? QString("NAME") : QString("name"));
+    QCOMPARE(rec.fieldName(2), isToUpper ? QString("TITLE") : QString("title"));
+    QCOMPARE(rec.value(0).toString(), QString("1"));
+    QCOMPARE(rec.value(1), QVariant("harry"));
+    QCOMPARE(rec.value(2), QVariant(1));
+}
+
+void tst_QSqlQueryModel::setHeaderData()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
+
+    QSqlQueryModel model;
+
+    QVERIFY(!model.setHeaderData(5, Qt::Vertical, "foo"));
+    QVERIFY(model.headerData(5, Qt::Vertical).isValid());
+
+    model.setQuery(QSqlQuery("select * from " + qTableName("test", __FILE__, db), db));
+
+    qRegisterMetaType<Qt::Orientation>("Qt::Orientation");
+    QSignalSpy spy(&model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)));
+    QVERIFY(model.setHeaderData(2, Qt::Horizontal, "bar"));
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), QString("bar"));
+    QCOMPARE(spy.size(), 1);
+    QCOMPARE(qvariant_cast<Qt::Orientation>(spy.value(0).value(0)), Qt::Horizontal);
+    QCOMPARE(spy.value(0).value(1).toInt(), 2);
+    QCOMPARE(spy.value(0).value(2).toInt(), 2);
+
+    QVERIFY(!model.setHeaderData(7, Qt::Horizontal, "foo", Qt::ToolTipRole));
+    QVERIFY(!model.headerData(7, Qt::Horizontal, Qt::ToolTipRole).isValid());
+
+    bool isToUpper = (dbType == QSqlDriver::Interbase) || (dbType == QSqlDriver::Oracle) || (dbType == QSqlDriver::DB2);
+    QCOMPARE(model.headerData(0, Qt::Horizontal).toString(), isToUpper ? QString("ID") : QString("id"));
+    QCOMPARE(model.headerData(1, Qt::Horizontal).toString(), isToUpper ? QString("NAME") : QString("name"));
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), QString("bar"));
+    QVERIFY(model.headerData(3, Qt::Horizontal).isValid());
+}
+
+void tst_QSqlQueryModel::fetchMore()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    QSqlQueryModel model;
+    QSignalSpy modelAboutToBeResetSpy(&model, SIGNAL(modelAboutToBeReset()));
+    QSignalSpy modelResetSpy(&model, SIGNAL(modelReset()));
+
+    model.setQuery(QSqlQuery("select * from " + qTableName("many", __FILE__, db), db));
+    int rowCount = model.rowCount();
+
+    QCOMPARE(modelAboutToBeResetSpy.size(), 1);
+    QCOMPARE(modelResetSpy.size(), 1);
+
+    // If the driver doesn't return the query size fetchMore() causes the
+    // model to grow and new signals are emitted
+    QSignalSpy rowsInsertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int)));
+    if (!db.driver()->hasFeature(QSqlDriver::QuerySize)) {
+        model.fetchMore();
+        int newRowCount = model.rowCount();
+        QCOMPARE(rowsInsertedSpy.value(0).value(1).toInt(), rowCount);
+        QCOMPARE(rowsInsertedSpy.value(0).value(2).toInt(), newRowCount - 1);
+    }
+}
+
+// For task 149491: When used with QSortFilterProxyModel, a view and a
+// database that doesn't support the QuerySize feature, blank rows was
+// appended if the query returned more than 256 rows and setQuery()
+// was called more than once. This because an insertion of rows was
+// triggered at the same time as the model was being cleared.
+void tst_QSqlQueryModel::withSortFilterProxyModel()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    if (db.driver()->hasFeature(QSqlDriver::QuerySize))
+        QSKIP("Test applies only for drivers not reporting the query size.");
+
+    QSqlQueryModel model;
+    model.setQuery(QSqlQuery("SELECT * FROM " + qTableName("test3", __FILE__, db), db));
+    QSortFilterProxyModel proxy;
+    proxy.setSourceModel(&model);
+
+    QTableView view;
+    view.setModel(&proxy);
+
+    QSignalSpy modelAboutToBeResetSpy(&model, SIGNAL(modelAboutToBeReset()));
+    QSignalSpy modelResetSpy(&model, SIGNAL(modelReset()));
+    QSignalSpy modelRowsInsertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int)));
+    model.setQuery(QSqlQuery("SELECT * FROM " + qTableName("test3", __FILE__, db), db));
+    view.scrollToBottom();
+
+    QTestEventLoop::instance().enterLoop(1);
+
+    QCOMPARE(proxy.rowCount(), 511);
+
+    // setQuery() resets the model accompanied by begin and end signals
+    QCOMPARE(modelAboutToBeResetSpy.size(), 1);
+    QCOMPARE(modelResetSpy.size(), 1);
+
+    // The call to scrollToBottom() forces the model to fetch additional rows.
+    QCOMPARE(modelRowsInsertedSpy.size(), 1);
+    QCOMPARE(modelRowsInsertedSpy.value(0).value(1).toInt(), 256);
+    QCOMPARE(modelRowsInsertedSpy.value(0).value(2).toInt(), 510);
+}
+
+// For task 155402: When the model is already empty when setQuery() is called
+// no rows have to be removed and rowsAboutToBeRemoved and rowsRemoved should
+// not be emitted.
+void tst_QSqlQueryModel::setQuerySignalEmission()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    QSqlQueryModel model;
+    QSignalSpy modelAboutToBeResetSpy(&model, SIGNAL(modelAboutToBeReset()));
+    QSignalSpy modelResetSpy(&model, SIGNAL(modelReset()));
+
+    // First select, the model was empty and no rows had to be removed, but model resets anyway.
+    model.setQuery(QSqlQuery("SELECT * FROM " + qTableName("test", __FILE__, db), db));
+    QCOMPARE(modelAboutToBeResetSpy.size(), 1);
+    QCOMPARE(modelResetSpy.size(), 1);
+
+    // Second select, the model wasn't empty and two rows had to be removed!
+    // setQuery() resets the model accompanied by begin and end signals
+    model.setQuery(QSqlQuery("SELECT * FROM " + qTableName("test", __FILE__, db), db));
+    QCOMPARE(modelAboutToBeResetSpy.size(), 2);
+    QCOMPARE(modelResetSpy.size(), 2);
+}
+
+// For task 170783: When the query's result set is empty no rows should be inserted,
+// i.e. no rowsAboutToBeInserted or rowsInserted signals should be emitted.
+void tst_QSqlQueryModel::setQueryWithNoRowsInResultSet()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    QSqlQueryModel model;
+    QSignalSpy modelRowsAboutToBeInsertedSpy(&model, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)));
+    QSignalSpy modelRowsInsertedSpy(&model, SIGNAL(rowsInserted(QModelIndex,int,int)));
+
+    // The query's result set will be empty so no signals should be emitted!
+    QSqlQuery query(db);
+    QVERIFY_SQL(query, exec("SELECT * FROM " + qTableName("test", __FILE__, db) + " where 0 = 1"));
+    model.setQuery(std::move(query));
+    QCOMPARE(modelRowsAboutToBeInsertedSpy.size(), 0);
+    QCOMPARE(modelRowsInsertedSpy.size(), 0);
+}
+
+class NestedResetsTest: public QSqlQueryModel
+{
+    Q_OBJECT
+
+public:
+    NestedResetsTest(QObject *parent = nullptr) : QSqlQueryModel(parent), gotAboutToBeReset(false), gotReset(false)
+    {
+        connect(this, SIGNAL(modelAboutToBeReset()), this, SLOT(modelAboutToBeResetSlot()));
+        connect(this, SIGNAL(modelReset()), this, SLOT(modelResetSlot()));
+    }
+
+    void testNested()
+    {
+        // Only the outermost beginResetModel/endResetModel should
+        // emit signals.
+        gotAboutToBeReset = gotReset = false;
+        beginResetModel();
+        QCOMPARE(gotAboutToBeReset, true);
+        QCOMPARE(gotReset, false);
+
+        gotAboutToBeReset = gotReset = false;
+        beginResetModel();
+        QCOMPARE(gotAboutToBeReset, false);
+        QCOMPARE(gotReset, false);
+
+        gotAboutToBeReset = gotReset = false;
+        endResetModel();
+        QCOMPARE(gotAboutToBeReset, false);
+        QCOMPARE(gotReset, false);
+
+        gotAboutToBeReset = gotReset = false;
+        endResetModel();
+        QCOMPARE(gotAboutToBeReset, false);
+        QCOMPARE(gotReset, true);
+    }
+
+    void testClear() // QTBUG-49404: Basic test whether clear() emits signals.
+    {
+        gotAboutToBeReset = gotReset = false;
+        clear();
+        QVERIFY(gotAboutToBeReset);
+        QVERIFY(gotReset);
+    }
+
+private slots:
+    void modelAboutToBeResetSlot() { gotAboutToBeReset = true; }
+    void modelResetSlot() { gotReset = true; }
+
+private:
+    bool gotAboutToBeReset;
+    bool gotReset;
+};
+
+void tst_QSqlQueryModel::nestedResets()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    NestedResetsTest t;
+    t.testClear();
+    t.testNested();
+}
+
+// For task 180617
+// According to the task, several specific duplicate SQL queries would cause
+// multiple empty grid lines to be visible in the view
+void tst_QSqlQueryModel::task_180617()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+    const QString test3(qTableName("test3", __FILE__, db));
+
+    QTableView view;
+    QCOMPARE(view.columnAt(0), -1);
+    QCOMPARE(view.rowAt(0), -1);
+
+    QSqlQueryModel model;
+    model.setQuery( "SELECT TOP 0 * FROM " + test3, db );
+    view.setModel(&model);
+
+    bool error = false;
+    // Usually a syntax error
+    if (model.lastError().isValid())    // usually a syntax error
+        error = true;
+
+    QCOMPARE(view.columnAt(0), (error)?-1:0 );
+    QCOMPARE(view.rowAt(0), -1);
+
+    model.setQuery( "SELECT TOP 0 * FROM " + test3, db );
+    model.setQuery( "SELECT TOP 0 * FROM " + test3, db );
+    model.setQuery( "SELECT TOP 0 * FROM " + test3, db );
+    model.setQuery( "SELECT TOP 0 * FROM " + test3, db );
+
+    QCOMPARE(view.columnAt(0),  (error)?-1:0 );
+    QCOMPARE(view.rowAt(0), -1);
+}
+
+void tst_QSqlQueryModel::task_QTBUG_4963_setHeaderDataWithProxyModel()
+{
+    QSqlQueryModel plainModel;
+    QSortFilterProxyModel proxyModel;
+    proxyModel.setSourceModel(&plainModel);
+    QVERIFY(!plainModel.setHeaderData(0, Qt::Horizontal, QObject::tr("ID")));
+    // And it should not crash.
+}
+
+QTEST_MAIN(tst_QSqlQueryModel)
+#include "tst_qsqlquerymodel.moc"

tests/auto/sql/models/qsqlrelationaldelegate/CMakeLists.txt

@@ -0,0 +1,16 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qsqlrelationaldelegate Test:
+#####################################################################
+
+qt_internal_add_test(tst_qsqlrelationaldelegate
+    SOURCES
+        tst_qsqlrelationaldelegate.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+        Qt::Widgets
+)

tests/auto/sql/models/qsqlrelationaldelegate/tst_qsqlrelationaldelegate.cpp

@@ -0,0 +1,166 @@
+// Copyright (C) 2018 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+
+#include <QTest>
+#include <QtSql/QtSql>
+#include <QTableView>
+#include <QComboBox>
+
+#include "../../kernel/qsqldatabase/tst_databases.h"
+
+class tst_QSqlRelationalDelegate : public QObject
+{
+    Q_OBJECT
+
+public:
+    void recreateTestTables(QSqlDatabase);
+
+    tst_Databases dbs;
+    tst_QSqlRelationalDelegate();
+
+public slots:
+    void initTestCase_data();
+    void initTestCase();
+    void cleanupTestCase();
+    void init();
+    void cleanup();
+
+private slots:
+    void comboBoxEditor();
+private:
+    void dropTestTables(QSqlDatabase db);
+};
+
+tst_QSqlRelationalDelegate::tst_QSqlRelationalDelegate()
+{
+}
+
+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)
+{
+    const auto reltest1 = qTableName("reltest1", __FILE__, db);
+    const auto reltest2 = qTableName("reltest2", __FILE__, db);
+
+    dropTestTables(db);
+
+    QSqlQuery q(db);
+    const auto idField = db.driver()->escapeIdentifier(QLatin1String("id"), QSqlDriver::FieldName);
+    const auto nameField = db.driver()->escapeIdentifier(QLatin1String("name"), QSqlDriver::FieldName);
+    const auto titleKeyField = db.driver()->escapeIdentifier(QLatin1String("title_key"),
+                                                             QSqlDriver::FieldName);
+    const auto anotherTitleField = db.driver()->escapeIdentifier(QLatin1String("another_title_key"),
+                                                                 QSqlDriver::FieldName);
+    const auto titleField = db.driver()->escapeIdentifier(QLatin1String("title"),
+                                                          QSqlDriver::FieldName);
+    QVERIFY_SQL(q, exec("create table " + reltest1 +
+            " (" + idField + " int not null primary key, " + nameField + " varchar(20), " +
+            titleKeyField + " int, " + anotherTitleField + "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 + " (" + idField + " int not null primary key, "
+                        + titleKeyField + " 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 = { qTableName("reltest1", __FILE__, db), qTableName("reltest2", __FILE__, db) };
+    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);
+
+    const auto reltest1 = qTableName("reltest1", __FILE__, db);
+    const auto reltest2 = qTableName("reltest2", __FILE__, db);
+    const auto idField = db.driver()->escapeIdentifier(QLatin1String("id"), QSqlDriver::FieldName);
+    const auto nameField = db.driver()->escapeIdentifier(QLatin1String("name"), QSqlDriver::FieldName);
+    const auto titleKeyField = db.driver()->escapeIdentifier(QLatin1String("title_key"),
+                                                             QSqlDriver::FieldName);
+    QTableView tv;
+    QSqlRelationalTableModel model(0, db);
+    model.setEditStrategy(QSqlTableModel::OnManualSubmit);
+    model.setTable(reltest1);
+    model.setRelation(2, QSqlRelation(reltest2, idField, titleKeyField));
+    model.setRelation(3, QSqlRelation(reltest2, idField, titleKeyField));
+    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.size(), 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");
+    QTest::keyClick(tv.viewport(), Qt::Key_Tab);
+    QVERIFY_SQL(model, submitAll());
+
+    QSqlQuery qry(db);
+    QVERIFY_SQL(qry, exec("SELECT " + titleKeyField + " FROM " + reltest1 + " WHERE " + idField + "=1"));
+    QVERIFY(qry.next());
+    QCOMPARE(qry.value(0).toString(), "2");
+}
+
+QTEST_MAIN(tst_QSqlRelationalDelegate)
+#include "tst_qsqlrelationaldelegate.moc"

tests/auto/sql/models/qsqlrelationaltablemodel/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qsqlrelationaltablemodel Test:
+#####################################################################
+
+qt_internal_add_test(tst_qsqlrelationaltablemodel
+    SOURCES
+        tst_qsqlrelationaltablemodel.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)

tests/auto/sql/models/qsqltablemodel/CMakeLists.txt

@@ -0,0 +1,15 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+#####################################################################
+## tst_qsqltablemodel Test:
+#####################################################################
+
+qt_internal_add_test(tst_qsqltablemodel
+    SOURCES
+        tst_qsqltablemodel.cpp
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::Sql
+        Qt::SqlPrivate
+)