From a0237dbe6fb904aac1338ecc1aae2dbe0900ac3f Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 26 Mar 2018 11:24:57 +0200 Subject: Avoid a database upgrade when creating the db first. By setting the database version initially. --- common/genericresource.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'common/genericresource.cpp') diff --git a/common/genericresource.cpp b/common/genericresource.cpp index 97ce968..5f49814 100644 --- a/common/genericresource.cpp +++ b/common/genericresource.cpp @@ -58,10 +58,10 @@ void GenericResource::setSecret(const QString &s) bool GenericResource::checkForUpgrade() { - const auto currentDatabaseVersion = [&] { - auto store = Sink::Storage::DataStore(Sink::storageLocation(), mResourceContext.instanceId(), Sink::Storage::DataStore::ReadOnly); - return Storage::DataStore::databaseVersion(store.createTransaction(Storage::DataStore::ReadOnly)); - }(); + auto store = Sink::Storage::DataStore(Sink::storageLocation(), mResourceContext.instanceId(), Sink::Storage::DataStore::ReadOnly); + //We rely on the store already having been created in the pipeline constructor before this get's called. + Q_ASSERT(store.exists()); + const auto currentDatabaseVersion = Storage::DataStore::databaseVersion(store.createTransaction(Storage::DataStore::ReadOnly)); if (currentDatabaseVersion != Sink::latestDatabaseVersion()) { SinkLog() << "Starting database upgrade from " << currentDatabaseVersion << " to " << Sink::latestDatabaseVersion(); -- cgit v1.2.3