diff options
author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2021-01-18 16:51:33 +0300 |
---|---|---|
committer | Matthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr> | 2021-08-11 20:13:44 +0300 |
commit | f977a54694fbca67a3695cda01dbc0b35687dbc7 (patch) | |
tree | f175009e13fa54f3e1954bae2e197a9d6b08a14d /src/common | |
parent | d60eb67c2eafebc2a495fd95437e5fe54ae9394c (diff) |
Finish is already called in the destructor
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/ownsql.h | 4 | ||||
-rw-r--r-- | src/common/syncjournaldb.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/common/ownsql.h b/src/common/ownsql.h index 300bdc482..98d1d0de1 100644 --- a/src/common/ownsql.h +++ b/src/common/ownsql.h @@ -161,10 +161,10 @@ public: const QByteArray &lastQuery() const; int numRowsAffected(); void reset_and_clear_bindings(); - void finish(); private: void bindValueInternal(int pos, const QVariant &value); + void finish(); SqlDatabase *_sqldb = nullptr; sqlite3 *_db = nullptr; @@ -172,6 +172,8 @@ private: QString _error; int _errId; QByteArray _sql; + + friend class SqlDatabase; }; } // namespace OCC diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp index d2f880112..4855c0824 100644 --- a/src/common/syncjournaldb.cpp +++ b/src/common/syncjournaldb.cpp @@ -396,10 +396,7 @@ bool SyncJournalDb::checkConnect() && createQuery.errorId() == SQLITE_IOERR && sqlite3_extended_errcode(_db.sqliteDb()) == SQLITE_IOERR_SHMMAP) { qCWarning(lcDb) << "IO error SHMMAP on table creation, attempting with DELETE journal mode"; - _journalMode = "DELETE"; - createQuery.finish(); - pragma1.finish(); commitTransaction(); _db.close(); return checkConnect(); @@ -1864,8 +1861,6 @@ QVector<SyncJournalDb::PollInfo> SyncJournalDb::getPollInfos() info._url = query.stringValue(3); res.append(info); } - - query.finish(); return res; } |