3 files changed, 75 insertions, 7 deletions

diff --git a/common/query.h b/common/query.h
index bb826aa..29cff78 100644
--- a/common/query.h
+++ b/common/query.h
@@ -103,6 +103,7 @@ public:
     }
 
     Query(Flags flags = Flags())
+        : limit(0)
     {}
 
     Query& operator+=(const Query& rhs)
@@ -115,8 +116,6 @@ public:
         requestedProperties += rhs.requestedProperties;
         parentProperty = rhs.parentProperty;
         liveQuery = rhs.liveQuery;
-        syncOnDemand = rhs.syncOnDemand;
-        processAll = rhs.processAll;
         return *this;
     }
 
@@ -133,8 +132,7 @@ public:
     QByteArray parentProperty;
     QByteArray sortProperty;
     bool liveQuery;
-    bool syncOnDemand;
-    bool processAll;
+    int limit;
 };
 
 }
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 1f645e8..2d188ae 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -18,7 +18,9 @@
 */
 #include "queryrunner.h"
 
+#include <limits>
 #include <QTime>
+
 #include "commands.h"
 #include "log.h"
 #include "storage.h"
@@ -74,7 +76,7 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
     mResourceAccess(resourceAccess),
     mResultProvider(new ResultProvider<typename DomainType::Ptr>),
     mOffset(0),
-    mBatchSize(0)
+    mBatchSize(query.limit)
 {
     Trace() << "Starting query";
     //We delegate loading of initial data to the result provider, os it can decide for itself what it needs to load.
@@ -280,7 +282,7 @@ ResultSet QueryWorker<DomainType>::loadIncrementalResultSet(qint64 baseRevision,
 template<class DomainType>
 ResultSet QueryWorker<DomainType>::filterAndSortSet(ResultSet &resultSet, const std::function<bool(const Sink::ApplicationDomain::ApplicationDomainType::Ptr &domainObject)> &filter, const Sink::Storage::NamedDatabase &db, bool initialQuery, const QByteArray &sortProperty)
 {
-    bool sortingRequired = false;
+    const bool sortingRequired = !sortProperty.isEmpty();
     if (initialQuery && sortingRequired) {
         //Sort the complete set by reading the sort property and filling into a sorted map
         auto sortedMap = QSharedPointer<QMap<QByteArray, QByteArray>>::create();
@@ -290,7 +292,12 @@ ResultSet QueryWorker<DomainType>::filterAndSortSet(ResultSet &resultSet, const
                 //We're not interested in removals during the initial query
                 if ((operation != Sink::Operation_Removal) && filter(domainObject)) {
                     if (!sortProperty.isEmpty()) {
-                        sortedMap->insert(domainObject->getProperty(sortProperty).toString().toLatin1(), domainObject->identifier());
+                        const auto sortValue = domainObject->getProperty(sortProperty);
+                        if (sortValue.canConvert<QDateTime>()) {
+                            sortedMap->insert(QByteArray::number(std::numeric_limits<unsigned int>::max() - sortValue.toDateTime().toTime_t()), domainObject->identifier());
+                        } else {
+                            sortedMap->insert(sortValue.toString().toLatin1(), domainObject->identifier());
+                        }
                     } else {
                         sortedMap->insert(domainObject->identifier(), domainObject->identifier());
                     }
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 16376b9..50fc67f 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -259,6 +259,69 @@ private Q_SLOTS:
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
         QCOMPARE(model->rowCount(), 1);
     }
+
+    void testMailByFolderSortedByDate()
+    {
+        //Setup
+        Sink::ApplicationDomain::Folder::Ptr folderEntity;
+        {
+            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
+
+            Sink::Query query;
+            query.resources << "org.kde.dummy.instance1";
+
+            //Ensure all local data is processed
+            Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
+
+            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
+            QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
+            QCOMPARE(model->rowCount(), 1);
+
+            folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
+            QVERIFY(!folderEntity->identifier().isEmpty());
+
+            const auto date = QDateTime(QDate(2015, 7, 7), QTime(12, 0));
+            {
+                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                mail.setProperty("uid", "testSecond");
+                mail.setProperty("folder", folderEntity->identifier());
+                mail.setProperty("date", date.addDays(-1));
+                Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
+            }
+            {
+                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                mail.setProperty("uid", "testLatest");
+                mail.setProperty("folder", folderEntity->identifier());
+                mail.setProperty("date", date);
+                Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
+            }
+            {
+                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                mail.setProperty("uid", "testLast");
+                mail.setProperty("folder", folderEntity->identifier());
+                mail.setProperty("date", date.addDays(-2));
+                Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
+            }
+        }
+
+        //Test
+        Sink::Query query;
+        query.resources << "org.kde.dummy.instance1";
+        query.propertyFilter.insert("folder", folderEntity->identifier());
+        query.sortProperty = "date";
+        query.limit = 1;
+
+        //Ensure all local data is processed
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
+
+        //We fetch before the data is available and rely on the live query mechanism to deliver the actual data
+        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
+        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
+        //The model is not sorted, but the limited set is sorted, so we can only test for the latest result.
+        QCOMPARE(model->rowCount(), 1);
+        QCOMPARE(model->index(0, 0).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Mail::Ptr>()->getProperty("uid").toByteArray(), QByteArray("testLatest"));
+    }
 };
 
 QTEST_MAIN(QueryTest)