From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Tue, 29 Jan 2019 07:52:25 +0000 (-0500)
Subject: core: Remove redundant updateSchemaVersion() call
X-Git-Tag: test-travis-01~71
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=25c0f8fb1b69e431cf7b231e2f61eb22dd940b5c;ds=sidebyside

core: Remove redundant updateSchemaVersion() call

Remove the redundant updateSchemaVersion() call at the end of schema
migrations.  This is already called within the final iteration of the
loop.

Cleans up a leftover from f10304a35af0a7a4f8b812e467e69287d358ce7c
---

diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp
index d53ae9e2..0ae3ebe2 100644
--- a/src/core/abstractsqlstorage.cpp
+++ b/src/core/abstractsqlstorage.cpp
@@ -309,14 +309,6 @@ bool AbstractSqlStorage::upgradeDb()
         }
     }
 
-    // Update the schema version for the final step.  Split this out to offer more informative
-    // logging (though setting schema version really should not fail).
-    if (!updateSchemaVersion(schemaVersion())) {
-        // Updating the final schema version failed, bail out
-        qCritical() << "Unable to upgrade Logging Backend!  Setting final schema version" << schemaVersion() << "failed.";
-        return false;
-    }
-
     // If we made it here, everything seems to have worked!
     return true;
 }