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

Tests/QSqlDriver: move cleanup tables into own function

Browse Source 
Move the cleanup of the temporary tables into an own function and call them during init and cleanup. this makes sure the tables are
 - deleted on clean exit
 - not there during init when cleanup was not run (e.g. due to debugging or a crash).

Pick-to: 6.8
Change-Id: I9013a26b0166d0756a37f0a5d50ed825adf63868
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit c833ed5711b40465a77a2d43b79e041092e638cc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2025-03-28 20:50:17 +01:00 committed by Qt Cherry-pick Bot
parent cfda487726
commit deebbbba60
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
View File

@ -13,6 +13,7 @@ class tst_QSqlDriver : public QObject
public: public:
void recreateTestTables(QSqlDatabase); void recreateTestTables(QSqlDatabase);
void dropTables();
tst_Databases dbs; tst_Databases dbs;
@ -54,8 +55,6 @@ void tst_QSqlDriver::recreateTestTables(QSqlDatabase db)
{ {
QSqlQuery q(db); QSqlQuery q(db);
const QString tableName(qTableName("relTEST1", __FILE__, db)); const QString tableName(qTableName("relTEST1", __FILE__, db));
tst_Databases::safeDropTables(db, {tableName});
QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db); QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
if (dbType == QSqlDriver::PostgreSQL) if (dbType == QSqlDriver::PostgreSQL)
QVERIFY_SQL( q, exec("set client_min_messages='warning'")); QVERIFY_SQL( q, exec("set client_min_messages='warning'"));
@ -80,13 +79,7 @@ void tst_QSqlDriver::recreateTestTables(QSqlDatabase db)
QVERIFY_SQL( q, exec("insert into " + tableName + " values(4, 'boris', 2, 2, 2.345678)")); QVERIFY_SQL( q, exec("insert into " + tableName + " values(4, 'boris', 2, 2, 2.345678)"));
} }
void tst_QSqlDriver::initTestCase() void tst_QSqlDriver::dropTables()
{
for (const QString &dbname : std::as_const(dbs.dbNames))
recreateTestTables(QSqlDatabase::database(dbname));
}
void tst_QSqlDriver::cleanupTestCase()
{ {
for (const QString &dbName : std::as_const(dbs.dbNames)) { for (const QString &dbName : std::as_const(dbs.dbNames)) {
QSqlDatabase db = QSqlDatabase::database(dbName); QSqlDatabase db = QSqlDatabase::database(dbName);
@ -96,6 +89,18 @@ void tst_QSqlDriver::cleanupTestCase()
tables.push_back(qTableName("clobTable", __FILE__, db)); tables.push_back(qTableName("clobTable", __FILE__, db));
tst_Databases::safeDropTables(db, tables); tst_Databases::safeDropTables(db, tables);
} }
}
void tst_QSqlDriver::initTestCase()
{
dropTables();
for (const QString &dbname : std::as_const(dbs.dbNames))
recreateTestTables(QSqlDatabase::database(dbname));
}
void tst_QSqlDriver::cleanupTestCase()
{
dropTables();
dbs.close(); dbs.close();
} }