Fixed query flags.

2 files changed, 43 insertions, 2 deletions

diff --git a/common/query.h b/common/query.h
index 50e93de..8e9050d 100644
--- a/common/query.h
+++ b/common/query.h
@@ -296,10 +296,11 @@ class SINK_EXPORT Query : public QueryBase
 public:
     enum Flag
     {
+        NoFlags = 0,
         /** Leave the query running and continuously update the result set. */
-        LiveQuery,
+        LiveQuery = 1,
         /** Run the query synchronously. */
-        SynchronousQuery
+        SynchronousQuery = 2
     };
     Q_DECLARE_FLAGS(Flags, Flag)
 
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 0d3ffc3..0641c0d 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -670,6 +670,46 @@ private slots:
         QTRY_COMPARE(model->rowCount(), 0);
     }
 
+    void testDontUpdateNonLiveQuery()
+    {
+        // Setup
+        auto folder1 = Folder::createEntity<Folder>("sink.dummy.instance1");
+        VERIFYEXEC(Sink::Store::create<Folder>(folder1));
+
+        auto mail1 = Mail::createEntity<Mail>("sink.dummy.instance1");
+        mail1.setExtractedMessageId("mail1");
+        mail1.setFolder(folder1);
+        mail1.setUnread(false);
+        VERIFYEXEC(Sink::Store::create(mail1));
+
+        // Ensure all local data is processed
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+
+        Query query;
+        //Not a live query
+        query.setFlags(Query::Flags{});
+        query.setId("testNoLiveQuery");
+        query.filter<Mail::Folder>(folder1);
+        query.reduce<Mail::ThreadId>(Query::Reduce::Selector::max<Mail::Date>()).count("count").collect<Mail::Sender>("senders");
+        query.sort<Mail::Date>();
+        query.request<Mail::Unread>();
+        QVERIFY(!query.liveQuery());
+
+        auto model = Sink::Store::loadModel<Mail>(query);
+        QTRY_COMPARE(model->rowCount(), 1);
+
+        //After the modifcation the mail should have vanished.
+        {
+            mail1.setUnread(true);
+            VERIFYEXEC(Sink::Store::modify(mail1));
+        }
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+        QTRY_COMPARE(model->rowCount(), 1);
+        auto mail = model->data(model->index(0, 0, QModelIndex{}), Sink::Store::DomainObjectRole).value<Mail::Ptr>();
+        QTest::qWait(100);
+        QCOMPARE(mail->getUnread(), false);
+    }
+
     void testLivequeryModifcationUpdateInThread()
     {
         // Setup