2 files changed, 30 insertions, 12 deletions

diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index f196965..f3a9af8 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -245,23 +245,12 @@ ReplayResult QueryWorker<DomainType>::executeInitialQuery(
     QTime time;
     time.start();
 
-    auto modifiedQuery = query;
-    if (!query.parentProperty().isEmpty()) {
-        if (parent) {
-            SinkTraceCtx(mLogCtx) << "Running initial query for parent:" << parent->identifier();
-            modifiedQuery.filter(query.parentProperty(), Query::Comparator(QVariant::fromValue(Sink::ApplicationDomain::Reference{parent->identifier()})));
-        } else {
-            SinkTraceCtx(mLogCtx) << "Running initial query for toplevel";
-            modifiedQuery.filter(query.parentProperty(), Query::Comparator(QVariant{}));
-        }
-    }
-
     auto entityStore = EntityStore{mResourceContext, mLogCtx};
     auto preparedQuery = [&] {
         if (state) {
             return DataStoreQuery{*state, ApplicationDomain::getTypeName<DomainType>(), entityStore, false};
         } else {
-            return DataStoreQuery{modifiedQuery, ApplicationDomain::getTypeName<DomainType>(), entityStore};
+            return DataStoreQuery{query, ApplicationDomain::getTypeName<DomainType>(), entityStore};
         }
     }();
     auto resultSet = preparedQuery.execute();
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 714e549..3b62f56 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -250,6 +250,35 @@ private slots:
         QCOMPARE(model->rowCount(model->index(0, 0)), 1);
     }
 
+    void testIncrementalFolderTree()
+    {
+        // Setup
+        auto folder = ApplicationDomainType::createEntity<Folder>("sink.dummy.instance1");
+        VERIFYEXEC(Sink::Store::create<Folder>(folder));
+        // Ensure all local data is processed
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+
+        // Test
+        Sink::Query query{Sink::Query::LiveQuery};
+        query.resourceFilter("sink.dummy.instance1");
+        query.requestTree<Folder::Parent>();
+
+        // We fetch after the data is available and don't rely on the live query mechanism to deliver the actual data
+        auto model = Sink::Store::loadModel<Folder>(query);
+        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
+        QCOMPARE(model->rowCount(), 1);
+        model->fetchMore(model->index(0, 0));
+
+        auto subfolder = ApplicationDomainType::createEntity<Folder>("sink.dummy.instance1");
+        subfolder.setParent(folder.identifier());
+        VERIFYEXEC(Sink::Store::create<Folder>(subfolder));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+
+        model->fetchMore(model->index(0, 0));
+        QTRY_VERIFY(model->data(model->index(0, 0), Sink::Store::ChildrenFetchedRole).toBool());
+        QCOMPARE(model->rowCount(model->index(0, 0)), 1);
+    }
+
     void testMailByMessageId()
     {
         // Setup