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

QSqlDatabase: make evident the name of the driver that failed to load

Browse Source 
Tell me this isn't confusing:
 Got keys from plugin meta data ("QMYSQL3", "QMYSQL", "QMARIADB")
 QSqlDatabase:  driver not loaded
 QSqlDatabase: available drivers: QSQLITE QMARIADB QMYSQL QMYSQL3

This also merges the two messages into a single line, which is nicer for
rich logging environments.

Change-Id: Ieb80c6571213dddc518bfffdb6c86632df8f932c
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 4216ba7c37dbdf67bfb5dc793d01a232ce4ea762)
(cherry picked from commit 22dd10e261c1c9ab46a8bfe99f574bae1c6c01e9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2025-04-09 09:54:40 -07:00 committed by Qt Cherry-pick Bot
parent 9a6b7641e8
commit d0787745aa
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/kernel/qsqldatabase.cpp
View File

@ -655,9 +655,9 @@ void QSqlDatabasePrivate::init(const QString &type)
driver = qLoadPlugin<QSqlDriver, QSqlDriverPlugin>(loader(), type); driver = qLoadPlugin<QSqlDriver, QSqlDriverPlugin>(loader(), type);
if (!driver) { if (!driver) {
qCWarning(lcSqlDb, "QSqlDatabase: %ls driver not loaded", qUtf16Printable(type)); qCWarning(lcSqlDb,
qCWarning(lcSqlDb, "QSqlDatabase: available drivers: %ls", "QSqlDatabase: can not load requested driver '%ls', available drivers: %ls",
qUtf16Printable(QSqlDatabase::drivers().join(u' '))); qUtf16Printable(type), qUtf16Printable(QSqlDatabase::drivers().join(u' ')));
if (QCoreApplication::instance() == nullptr) if (QCoreApplication::instance() == nullptr)
qCWarning(lcSqlDb, "QSqlDatabase: an instance of QCoreApplication is required for loading driver plugins"); qCWarning(lcSqlDb, "QSqlDatabase: an instance of QCoreApplication is required for loading driver plugins");
driver = shared_null()->driver; driver = shared_null()->driver;

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

@ -383,8 +383,9 @@ void tst_QSqlDatabase::generic_data(const QString& engine)
void tst_QSqlDatabase::addDatabase() void tst_QSqlDatabase::addDatabase()
{ {
QTest::ignoreMessage(QtWarningMsg, "QSqlDatabase: BLAH_FOO_NONEXISTENT_DRIVER driver not loaded"); QTest::ignoreMessage(QtWarningMsg,
QTest::ignoreMessage(QtWarningMsg, qPrintable("QSqlDatabase: available drivers: " + QSqlDatabase::drivers().join(QLatin1Char(' ')))); "QSqlDatabase: can not load requested driver 'BLAH_FOO_NONEXISTENT_DRIVER', available drivers: "
+ QSqlDatabase::drivers().join(QLatin1Char(' ')).toLatin1());
{ {
QSqlDatabase db = QSqlDatabase::addDatabase("BLAH_FOO_NONEXISTENT_DRIVER", QSqlDatabase db = QSqlDatabase::addDatabase("BLAH_FOO_NONEXISTENT_DRIVER",
"INVALID_CONNECTION"); "INVALID_CONNECTION");

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

@ -2908,10 +2908,10 @@ void tst_QSqlQuery::queryOnInvalidDatabase()
QSqlDatabase::removeDatabase("invalidConnection"); QSqlDatabase::removeDatabase("invalidConnection");
}); });
// Note: destruction of db needs to happen before we call removeDatabase. // Note: destruction of db needs to happen before we call removeDatabase.
QTest::ignoreMessage(QtWarningMsg, "QSqlDatabase: INVALID driver not loaded");
#if QT_CONFIG(regularexpression) #if QT_CONFIG(regularexpression)
QTest::ignoreMessage(QtWarningMsg, QTest::ignoreMessage(QtWarningMsg,
QRegularExpression("QSqlDatabase: available drivers: ")); QRegularExpression("QSqlDatabase: can not load requested driver "
"'INVALID', available drivers: "));
#endif #endif
QSqlDatabase db = QSqlDatabase::addDatabase("INVALID", "invalidConnection"); QSqlDatabase db = QSqlDatabase::addDatabase("INVALID", "invalidConnection");
QVERIFY(db.lastError().isValid()); QVERIFY(db.lastError().isValid());