From 33d7a7e37bb418d325f9aba704e97ccf94118f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Wed, 27 Nov 2019 12:55:21 +0100 Subject: [PATCH] Fix tests --- src/colnod/databaseapi.cpp | 1 - src/colnod/syncmanager.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp index 53d7972..3e1e67e 100644 --- a/src/colnod/databaseapi.cpp +++ b/src/colnod/databaseapi.cpp @@ -38,7 +38,6 @@ bool DatabaseAPI::executeQuery(QSqlQuery &query, const QString &statement) std::shared_ptr DatabaseAPI::downloadData() { - bool res = true; auto updatedQuery = mDbMan->createQuery(); auto deletedQuery = mDbMan->createQuery(); if (!executeQuery(updatedQuery, "SELECT * FROM colnod_token WHERE last_modified > last_update AND deleted = false")) { diff --git a/src/colnod/syncmanager.cpp b/src/colnod/syncmanager.cpp index 06ccfd9..5f39e5c 100644 --- a/src/colnod/syncmanager.cpp +++ b/src/colnod/syncmanager.cpp @@ -129,7 +129,7 @@ bool SyncManager::downloadData() //database->downloadData(); colnod->downloadData(); - return true; + return res; } // finds conflicts -> changes on both sides (colnod and DB), apply newer change