pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

support mysql -> sqlite fallback

Browse source
This commit is contained in:
Martin Rotter 2021-03-15 13:58:26 +01:00
parent e306fc1182
commit 98be85fa14
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/librssguard/database/databasefactory.cpp
View file

@ -52,15 +52,14 @@ void DatabaseFactory::determineDriver() {
} }
catch (const ApplicationException& ex) { catch (const ApplicationException& ex) {
qCriticalNN << LOGSEC_DB qCriticalNN << LOGSEC_DB
<< "Failed to reach connection to DB source, will fallback to SQLite:" << "Failed to reach connection to DB source, let's fallback to SQLite:"
<< QUOTE_W_SPACE_DOT(ex.message()); << QUOTE_W_SPACE_DOT(ex.message());
qApp->showGuiMessage(tr("Cannot connect to database"), MessageBox::show(nullptr,
tr("Connection to your database was not established with error '%1'. " QMessageBox::Icon::Critical,
"Falling back to SQLite.").arg(ex.message()), tr("Cannot connect to database"),
QSystemTrayIcon::MessageIcon::Critical, tr("Connection to your database was not established with error: '%1'. "
nullptr, "Falling back to SQLite.").arg(ex.message()));
true);
m_dbDriver = boolinq::from(m_allDbDrivers).first([](DatabaseDriver* driv) { m_dbDriver = boolinq::from(m_allDbDrivers).first([](DatabaseDriver* driv) {
return driv->driverType() == DatabaseDriver::DriverType::SQLite; return driv->driverType() == DatabaseDriver::DriverType::SQLite;

8
src/librssguard/database/mariadbdriver.cpp
View file

@ -150,8 +150,8 @@ QSqlDatabase MariaDbDriver::initializeDatabase(const QString& connection_name) {
database.setPassword(qApp->settings()->password(GROUP(Database), SETTING(Database::MySQLPassword)).toString()); database.setPassword(qApp->settings()->password(GROUP(Database), SETTING(Database::MySQLPassword)).toString());
if (!database.open()) { if (!database.open()) {
qFatal("Cannot open MySQL database: %s. Make sure your DB server is running and " // NOTE: In this case throw exception and fallback SQL backend will be used.
"start application again.", qPrintable(database.lastError().text())); throw ApplicationException(database.lastError().text());
} }
else { else {
QSqlQuery query_db(database); QSqlQuery query_db(database);
@ -279,8 +279,8 @@ QSqlDatabase MariaDbDriver::connection(const QString& connection_name, DatabaseD
} }
if (!database.isOpen() && !database.open()) { if (!database.isOpen() && !database.open()) {
qFatal("MySQL database was NOT opened. Delivered error message: '%s'.", // NOTE: In this case throw exception and fallback SQL backend will be used.
qPrintable(database.lastError().text())); throw ApplicationException(database.lastError().text());
} }
else { else {
qDebugNN << LOGSEC_DB qDebugNN << LOGSEC_DB