properly query sync journal DB to know when to run fix for VFS

the new method added to query the db is not working and so the fix for
vfs is executed at each sync run

the new method for bool was not really needed so let's just remove it
(and that will make the usage of SqlQuery be correct

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

2 files changed, 7 insertions, 26 deletions

diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index 9d1fd8fb6..0b66a6cc0 100644
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -996,42 +996,25 @@ void SyncJournalDb::keyValueStoreSet(const QString &key, QVariant value)
 
 qint64 SyncJournalDb::keyValueStoreGetInt(const QString &key, qint64 defaultValue)
 {
-    const auto sqlQuery = keyValueStoreExecuteSelectQuery(key);
-    if (sqlQuery.isValid()) {
-        return sqlQuery.get()->int64Value(0);
-    }
-    return defaultValue;
-}
-
-bool SyncJournalDb::keyValueStoreGetBool(const QString &key, const bool defaultValue)
-{
-    const auto sqlQuery = keyValueStoreExecuteSelectQuery(key);
-    if (sqlQuery.isValid()) {
-        return sqlQuery.get()->intValue(0);
-    }
-    return defaultValue;
-}
-
-OCC::Optional<PreparedSqlQuery> SyncJournalDb::keyValueStoreExecuteSelectQuery(const QString &key)
-{
     QMutexLocker locker(&_mutex);
     if (!checkConnect()) {
-        return {};
+        return defaultValue;
     }
 
-    const auto query = _queryManager.get(PreparedSqlQueryManager::GetKeyValueStoreQuery, QByteArrayLiteral("SELECT value FROM key_value_store WHERE key = ?1;"), _db);
+    const auto query = _queryManager.get(PreparedSqlQueryManager::GetKeyValueStoreQuery, QByteArrayLiteral("SELECT value FROM key_value_store WHERE key=?1"), _db);
     if (!query) {
-        return {};
+        return defaultValue;
     }
 
     query->bindValue(1, key);
     query->exec();
+    auto result = query->next();
 
-    if (!query->next().hasData) {
-        return {};
+    if (!result.ok || !result.hasData) {
+        return defaultValue;
     }
 
-    return query;
+    return query->int64Value(0);
 }
 
 void SyncJournalDb::keyValueStoreDelete(const QString &key)
diff --git a/src/common/syncjournaldb.h b/src/common/syncjournaldb.h
index 9c90b4908..d51919f49 100644
--- a/src/common/syncjournaldb.h
+++ b/src/common/syncjournaldb.h
@@ -70,7 +70,6 @@ public:
 
     void keyValueStoreSet(const QString &key, QVariant value);
     qint64 keyValueStoreGetInt(const QString &key, qint64 defaultValue);
-    bool keyValueStoreGetBool(const QString &key, const bool defaultValue);
     void keyValueStoreDelete(const QString &key);
 
     bool deleteFileRecord(const QString &filename, bool recursively = false);
@@ -372,7 +371,6 @@ public:
     int autotestFailCounter = -1;
 
 private:
-    OCC::Optional<PreparedSqlQuery> keyValueStoreExecuteSelectQuery(const QString &key);
     int getFileRecordCount();
     bool updateDatabaseStructure();
     bool updateMetadataTableStructure();