mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some SQL error and warning

Browse Source 
Such as:
 Error opening the db:  "Driver not loaded Driver not loaded"
or
 QSqlDatabasePrivate::removeDatabase: connection '...' is still in use, all queries will cease to wor

We need to clear the QSqlDatabase _db handle before calling removeDatabase.
And we also need to give a different name to different folder database, just to be sure
This commit is contained in:
Olivier Goffart 2013-11-25 15:07:58 +01:00
parent 5d6700c68d
commit ca3885de2a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mirall/syncjournaldb.cpp
View File

@ -24,7 +24,6 @@
#include "syncjournalfilerecord.h"
#define QSQLITE "QSQLITE"
#define SYNCJOURNALDB_CONNECTION_NAME "SyncJournalDbConnection"
namespace Mirall {
@ -105,9 +104,7 @@ bool SyncJournalDb::checkConnect()
}
// Add the connection
if (!QSqlDatabase::connectionNames().contains(SYNCJOURNALDB_CONNECTION_NAME)) {
_db = QSqlDatabase::addDatabase( QSQLITE, SYNCJOURNALDB_CONNECTION_NAME );
}
_db = QSqlDatabase::addDatabase( QSQLITE, _dbFile);
// Open the file
_db.setDatabaseName(_dbFile);
@ -261,9 +258,9 @@ void SyncJournalDb::close()
_deleteFileRecordRecursively.reset(0);
_blacklistQuery.reset(0);
_db.removeDatabase(SYNCJOURNALDB_CONNECTION_NAME);
_db.setDatabaseName(QString());
_db.close();
_db = QSqlDatabase(); // avoid the warning QSqlDatabasePrivate::removeDatabase: connection [...] still in use
QSqlDatabase::removeDatabase(_dbFile);
}
@ -752,7 +749,7 @@ void SyncJournalDb::commit(const QString& context, bool startTrans )
SyncJournalDb::~SyncJournalDb()
{
commitTransaction();
close();
}