1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QSqlDatabase: avoid some runtime warnings

Browse Source 
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>
This commit is contained in:
Christian Ehrlicher 2023-02-13 17:56:53 +01:00
parent 189444d8c4
commit 2adb22fba5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
View File

@ -1080,8 +1080,8 @@ void tst_QSqlDatabase::bigIntField()
QVERIFY_SQL(q, exec("create table " + qtest_bigint + "(id int, t_s64bit bigint, t_u64bit bigint)")); QVERIFY_SQL(q, exec("create table " + qtest_bigint + "(id int, t_s64bit bigint, t_u64bit bigint)"));
} else if (dbType == QSqlDriver::Oracle) { } else if (dbType == QSqlDriver::Oracle) {
QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int, t_u64bit int)")); QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int, t_u64bit int)"));
//} else if (dbType == QSqlDriver::Interbase) { } else if (dbType == QSqlDriver::SQLite) {
// QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int64, t_u64bit int64)")); QVERIFY_SQL(q, exec("create table " + qtest_bigint + " (id int, t_s64bit int, t_u64bit int)"));
} else { } else {
QSKIP("no 64 bit integer support"); QSKIP("no 64 bit integer support");
} }
@ -2312,6 +2312,10 @@ void tst_QSqlDatabase::cloneDatabase()
QFETCH(QString, dbName); QFETCH(QString, dbName);
QSqlDatabase db = QSqlDatabase::database(dbName); QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db); CHECK_DATABASE(db);
const auto wrapup = qScopeGuard([&]() {
QSqlDatabase::removeDatabase("clonedDatabase");
QSqlDatabase::removeDatabase("clonedDatabaseCopy");
});
{ {
QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(db, "clonedDatabase"); QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(db, "clonedDatabase");
QCOMPARE(clonedDatabase.databaseName(), db.databaseName()); QCOMPARE(clonedDatabase.databaseName(), db.databaseName());
@ -2353,6 +2357,7 @@ public slots:
QSqlDatabase invalidDb = QSqlDatabase::database("invalid"); QSqlDatabase invalidDb = QSqlDatabase::database("invalid");
QVERIFY(!invalidDb.isValid()); QVERIFY(!invalidDb.isValid());
const auto wrapup = qScopeGuard([&]() { QSqlDatabase::removeDatabase("CloneDB"); });
{ {
QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(dbName, "CloneDB"); QSqlDatabase clonedDatabase = QSqlDatabase::cloneDatabase(dbName, "CloneDB");
QVERIFY(!clonedDatabase.isOpen()); QVERIFY(!clonedDatabase.isOpen());

1
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
View File

@ -2920,6 +2920,7 @@ void tst_QSqlQuery::psql_specialFloatValues()
CHECK_DATABASE(db); CHECK_DATABASE(db);
QSqlQuery query(db); QSqlQuery query(db);
const QString tableName = qTableName("floattest", __FILE__, 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, exec(QLatin1String("create table %1 (value float)").arg(tableName)));
QVERIFY_SQL(query, prepare(QLatin1String("insert into %1 values(:value)").arg(tableName))); QVERIFY_SQL(query, prepare(QLatin1String("insert into %1 values(:value)").arg(tableName)));