Fixed badly reported offset when hitting the end of the collection

2024-03-12 13:40:32 +01:00
parent 4ea6d0dd09
commit 9da781cff6
2 changed files with 65 additions and 5 deletions
@@ -53,7 +53,10 @@ namespace Database::Utils
        RangeResults<ResultType> res;

        if (range)
+        {
+            res.range.offset = range->offset;
            applyRange(query, Range{ range->offset, range->size + 1 });
+        }

        auto collection{ query.resultList() };
        res.results.assign(collection.begin(), collection.end());
@@ -62,10 +65,7 @@ namespace Database::Utils
            // TODO may optim by not actually requesting the last one
            res.moreResults = true;
            res.results.pop_back();
-            res.range.offset = range->offset;
        }
-        else
-            res.moreResults = false;

        res.range.size = res.results.size();