diff --git a/logdoctor/modules/craplog/modules/hash.cpp b/logdoctor/modules/craplog/modules/hash.cpp index 92e9abe9..720abccb 100644 --- a/logdoctor/modules/craplog/modules/hash.cpp +++ b/logdoctor/modules/craplog/modules/hash.cpp @@ -29,7 +29,12 @@ bool HashOps::loadUsedHashesLists( const std::string& db_path ) bool successful = true; const QString db_name = QString::fromStdString( db_path.substr( db_path.find_last_of( '/' ) + 1 ) ); - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( db_path ) ); if ( ! db.open() ) { @@ -174,7 +179,12 @@ bool HashOps::insertUsedHashes( const std::string& db_path, const std::vector>>> dates = { {11, {}}, {12, {}}, {13, {}} }; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( this->db_path )); if ( ! db.open() ) { @@ -294,7 +299,12 @@ void DbQuery::updateWarnings( const QString& web_server, const std::vectordb_path )); if ( ! db.open() ) { @@ -343,7 +353,12 @@ void DbQuery::getWarnCounts( std::tuple>>> items; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( this->db_path )); if ( ! db.open() ) { @@ -482,7 +497,12 @@ void DbQuery::getSpeedData(std::tuple>> data; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( this->db_path )); if ( ! db.open() ) { @@ -833,7 +853,12 @@ void DbQuery::getItemsCount( std::tuple aux_items; std::vector> items; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( this->db_path )); if ( ! db.open() ) { @@ -942,7 +967,12 @@ void DbQuery::getDaytimeCounts( std::tupledb_path )); if ( ! db.open() ) { @@ -1180,7 +1210,12 @@ void DbQuery::getRelationalCountsDay(std::tuple> data; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( this->db_path )); if ( ! db.open() ) { @@ -1423,7 +1458,12 @@ void DbQuery::getRelationalCountsPeriod(std::tuple> data; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( this->db_path )); if ( ! db.open() ) { @@ -1808,7 +1848,12 @@ const bool DbQuery::getGlobalCounts( const QString& web_server, const std::unord { bool successful = true; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( this->db_path )); if ( ! db.open() ) { diff --git a/logdoctor/utilities/checks.cpp b/logdoctor/utilities/checks.cpp index 6646e8ef..4ee0e43a 100644 --- a/logdoctor/utilities/checks.cpp +++ b/logdoctor/utilities/checks.cpp @@ -138,7 +138,12 @@ bool CheckSec::checkStatsDatabase( const std::string& db_path ) const QString db_name = QString::fromStdString( db_path.substr( db_path.find_last_of( '/' ) + 1 ) ); const std::vector ws_names = { "apache", "nginx", "iis" }; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( db_path ) ); // check the existence @@ -346,7 +351,12 @@ bool CheckSec::checkHashesDatabase( const std::string& db_path ) const QString db_name = QString::fromStdString( db_path.substr( db_path.find_last_of( '/' ) + 1 ) ); const std::vector ws_names = { "apache", "nginx", "iis" }; - QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE"); + QSqlDatabase db; + if ( QSqlDatabase::contains("qt_sql_default_connection") ) { + db = QSqlDatabase::database("qt_sql_default_connection"); + } else { + db = QSqlDatabase::addDatabase("QSQLITE"); + } db.setDatabaseName( QString::fromStdString( db_path ) ); // check the existence