From dba48964ccdb625dd35c64a4c9f47a3b718481d7 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 11 Aug 2020 10:30:19 +0200 Subject: Remove pointless warning We also don't have a version entry in the db if thne db is new. As I don't expect regular updates from 1.5 this message can just be removed. Fixes: #8004 --- src/common/syncjournaldb.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp index d9eb2f675..7d6950c79 100644 --- a/src/common/syncjournaldb.cpp +++ b/src/common/syncjournaldb.cpp @@ -485,7 +485,7 @@ bool SyncJournalDb::checkConnect() "name TEXT UNIQUE" ");"); if (!createQuery.exec()) { - return sqlFail(QStringLiteral("Create table version"), createQuery); + return sqlFail(QStringLiteral("Create table checksumtype"), createQuery); } // create the datafingerprint table. @@ -530,8 +530,6 @@ bool SyncJournalDb::checkConnect() SqlQuery versionQuery("SELECT major, minor, patch FROM version;", _db); if (!versionQuery.next().hasData) { - // If there was no entry in the table, it means we are likely upgrading from 1.5 - qCInfo(lcDb) << "possibleUpgradeFromMirall_1_5 detected!"; forceRemoteDiscovery = true; createQuery.prepare("INSERT INTO version VALUES (?1, ?2, ?3, ?4);"); -- cgit v1.2.3