From 2adb22fba5580bc1b8f8f86758c4ca2aaf122cb3 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Mon, 13 Feb 2023 17:56:53 +0100 Subject: tst_QSqlDatabase: avoid some runtime warnings Make sure to properly close the cloned database connections and allow one test for sqlite Change-Id: Ia4eb4a684a3c432844e4b2a77bff69655b53f9b2 Reviewed-by: Volker Hilsheimer --- tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 9 +++++++-- tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index 2a3f13699e..255418d159 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp @@ -1080,8 +1080,8 @@ void tst_QSqlDatabase::bigIntField() QVERIFY_SQL(q, exec("create table " + qtest_bigint + "(id int, t_s64bit bigint, t_u64bit bigint)")); } else if (dbType == QSqlDriver::Oracle) { QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int, t_u64bit int)")); - //} else if (dbType == QSqlDriver::Interbase) { - // QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int64, t_u64bit int64)")); + } else if (dbType == QSqlDriver::SQLite) { + QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int, t_u64bit int)")); } else { QSKIP("no 64 bit integer support"); } @@ -2312,6 +2312,10 @@ void tst_QSqlDatabase::cloneDatabase() QFETCH(QString, dbName); QSqlDatabase db = QSqlDatabase::database(dbName); CHECK_DATABASE(db); + const auto wrapup = qScopeGuard([&]() { + QSqlDatabase::removeDatabase("clonedDatabase"); + QSqlDatabase::removeDatabase("clonedDatabaseCopy"); + }); { QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(db, "clonedDatabase"); QCOMPARE(clonedDatabase.databaseName(), db.databaseName()); @@ -2353,6 +2357,7 @@ public slots: QSqlDatabase invalidDb = QSqlDatabase::database("invalid"); QVERIFY(!invalidDb.isValid()); + const auto wrapup = qScopeGuard([&]() { QSqlDatabase::removeDatabase("CloneDB"); }); { QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(dbName, "CloneDB"); QVERIFY(!clonedDatabase.isOpen()); diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 3f2184b6b6..8f8a872da5 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -2920,6 +2920,7 @@ void tst_QSqlQuery::psql_specialFloatValues() CHECK_DATABASE(db); QSqlQuery query(db); const QString tableName = qTableName("floattest", __FILE__, db); + const auto wrapup = qScopeGuard([&]() { tst_Databases::safeDropTable(db, tableName); }); QVERIFY_SQL(query, exec(QLatin1String("create table %1 (value float)").arg(tableName))); QVERIFY_SQL(query, prepare(QLatin1String("insert into %1 values(:value)").arg(tableName))); -- cgit v1.2.3