From 51f1ce7810c7b7fb87bc476471fa54d34b7ad2f7 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 18 Oct 2017 13:30:13 +0200 Subject: [PATCH] Sqlite: Add journal option to database constructor Makes tests much easier. Change-Id: I8b5892ff0deb2e22ac0e874dda0d8d20a32fd2e6 Reviewed-by: Tim Jenssen --- src/libs/sqlite/sqlitedatabase.cpp | 5 ++++- src/libs/sqlite/sqlitedatabase.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/sqlite/sqlitedatabase.cpp b/src/libs/sqlite/sqlitedatabase.cpp index aa265593c5a..2d977c27b11 100644 --- a/src/libs/sqlite/sqlitedatabase.cpp +++ b/src/libs/sqlite/sqlitedatabase.cpp @@ -35,9 +35,10 @@ Database::Database() { } -Database::Database(Utils::PathString &&databaseFilePath) +Database::Database(Utils::PathString &&databaseFilePath, JournalMode journalMode) : m_databaseBackend(*this) { + setJournalMode(journalMode); open(std::move(databaseFilePath)); } @@ -128,4 +129,6 @@ DatabaseBackend &Database::backend() return m_databaseBackend; } + + } // namespace Sqlite diff --git a/src/libs/sqlite/sqlitedatabase.h b/src/libs/sqlite/sqlitedatabase.h index 125bccaf24a..0f8158a6977 100644 --- a/src/libs/sqlite/sqlitedatabase.h +++ b/src/libs/sqlite/sqlitedatabase.h @@ -47,7 +47,7 @@ public: using MutexType = std::mutex; Database(); - Database(Utils::PathString &&databaseFilePath); + Database(Utils::PathString &&databaseFilePath, JournalMode journalMode=JournalMode::Wal); Database(const Database &) = delete; bool operator=(const Database &) = delete;