ondra/colnod-connector
1
0
Fork 1
mirror of https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git synced 2026-07-12 23:30:48 +02:00
Code Issues Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Ondřej Fischer 2019-11-27 12:55:21 +01:00
parent b8785b4bcd
commit 33d7a7e37b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/colnod/databaseapi.cpp
View File

@ -38,7 +38,6 @@ bool DatabaseAPI::executeQuery(QSqlQuery &query, const QString &statement)
std::shared_ptr<Data> DatabaseAPI::downloadData() std::shared_ptr<Data> DatabaseAPI::downloadData()
{ {
bool res = true;
auto updatedQuery = mDbMan->createQuery(); auto updatedQuery = mDbMan->createQuery();
auto deletedQuery = mDbMan->createQuery(); auto deletedQuery = mDbMan->createQuery();
if (!executeQuery(updatedQuery, "SELECT * FROM colnod_token WHERE last_modified > last_update AND deleted = false")) { if (!executeQuery(updatedQuery, "SELECT * FROM colnod_token WHERE last_modified > last_update AND deleted = false")) {

2
src/colnod/syncmanager.cpp
View File

@ -129,7 +129,7 @@ bool SyncManager::downloadData()
//database->downloadData(); //database->downloadData();
colnod->downloadData(); colnod->downloadData();
return true; return res;
} }
// finds conflicts -> changes on both sides (colnod and DB), apply newer change // finds conflicts -> changes on both sides (colnod and DB), apply newer change