Skip to content

Fix warning when removing closed database connections #1394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 1 commit into from
Nov 25, 2017
Merged

Fix warning when removing closed database connections #1394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/util/db/dbconnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,22 @@ QSqlDatabase cloneDatabase(
}

void removeDatabase(
const QSqlDatabase& database) {
DEBUG_ASSERT(!database.isOpen());
QSqlDatabase::removeDatabase(database.connectionName());
QSqlDatabase* pDatabase) {
DEBUG_ASSERT(pDatabase);
DEBUG_ASSERT(!pDatabase->isOpen());
// pDatabase must be the last reference to the implicitly shared
// QSqlDatabase object
QString connectionName = pDatabase->connectionName();
// Drop the last reference before actually removing the database
// to avoid the following warning:
// "Warning [Main]: QSqlDatabasePrivate::removeDatabase: connection
// '...' is still in use, all queries will cease to work."
*pDatabase = QSqlDatabase();
// After all references have been dropped we can safely remove the
// connection. If still some of the afore mentioned warnings appear
// in the log than a component is misbehaving and still holding an
// invalid copy of the QSqlDatabase object that it shouldn't have!!
QSqlDatabase::removeDatabase(connectionName);
}

// The default comparison of strings for sorting.
Expand Down Expand Up @@ -296,7 +309,7 @@ DbConnection::DbConnection(

DbConnection::~DbConnection() {
close();
removeDatabase(m_sqlDatabase);
removeDatabase(&m_sqlDatabase);
}

bool DbConnection::open() {
Expand Down