1 files changed, 37 insertions, 3 deletions

diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index c62f6a97ff..5a10bde814 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 /* possible connection parameters */
 
 #ifndef TST_DATABASES_H
@@ -118,12 +118,14 @@ public:
         if (port > 0)
             cName += QLatin1Char(':') + QString::number(port);
 
+        QString opts = params;
         if (driver == "QSQLITE") {
             // Since the database for sqlite is generated at runtime it's always
             // available, but we use QTempDir so it's always in a different
             // location. Thus, let's ignore the path completely.
             cName = "SQLite";
             qInfo("SQLite will use the database located at %ls", qUtf16Printable(dbName));
+            opts += QStringLiteral(";QSQLITE_ENABLE_NON_ASCII_CASE_FOLDING");
         }
 
         auto db = QSqlDatabase::addDatabase(driver, cName);
@@ -137,7 +139,7 @@ public:
         db.setPassword(passwd);
         db.setHostName(host);
         db.setPort(port);
-        db.setConnectOptions(params);
+        db.setConnectOptions(opts);
         dbNames.append(cName);
     }
 
@@ -440,7 +442,8 @@ public:
 
     static QVersionNumber getIbaseEngineVersion(const QSqlDatabase &db)
     {
-        auto q = db.exec("SELECT rdb$get_context('SYSTEM', 'ENGINE_VERSION') as version from rdb$database;"_L1);
+        QSqlQuery q(db);
+        q.exec("SELECT rdb$get_context('SYSTEM', 'ENGINE_VERSION') as version from rdb$database;"_L1);
         q.next();
         auto record = q.record();
         auto version = QVersionNumber::fromString(record.value(0).toString());
@@ -494,5 +497,36 @@ private:
     QString m_tableName;
 };
 
+class ProcScope
+{
+public:
+    ProcScope(const QSqlDatabase &db, const char *procName, const char *file)
+        : m_db(db),
+          m_procName(qTableName(procName, file, db))
+    {
+        cleanup();
+    }
+    ~ProcScope()
+    {
+        cleanup();
+    }
+    QString name() const
+    {
+        return m_procName;
+    }
+protected:
+    void cleanup()
+    {
+        QSqlQuery q(m_db);
+        if (m_db.driverName() == "QIBASE")
+            q.exec("DROP PROCEDURE " + m_procName);
+        else
+            q.exec("DROP PROCEDURE IF EXISTS " + m_procName);
+    }
+private:
+    QSqlDatabase m_db;
+    const QString m_procName;
+};
+
 #endif