diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2023-02-13 17:56:53 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2023-03-02 15:02:02 +0100 |
| commit | 2adb22fba5580bc1b8f8f86758c4ca2aaf122cb3 (patch) | |
| tree | fe9881dc89882bc2623f51627c9da2a42b762445 /tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | |
| parent | 189444d8c4a1384479962e98e699bf1fd2908de8 (diff) | |
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 <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp')
| -rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index 2a3f13699e0..255418d159d 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()); |