query iterator using items is breaks when the DS isn't blocking

datastore/query.nim

@@ -29,11 +29,23 @@ type
     next*: GetNext
     dispose*: IterDispose
 
-proc collectAllQueries*(q: QueryIter)  =
+proc waitForAllQueryResults*(qi: Future[?!QueryIter]): Future[?!seq[QueryResponse]] {.async.} =
-  var qr: Future[?!QueryResponse]
+  ## for large blocks this would be *expensive*
-  while not q.finished:
+  var res: seq[QueryResponse]
-    qr = q.next()
+  without iter =? (await qi), err:
-    yield qr
+    return failure err
+
+  while not iter.finished:
+    let val = await iter.next()
+    if val.isOk():
+      let qr = val.tryGet()
+      if qr.key.isSome:
+        res.add qr
+    else:
+      return failure val.error()
+  
+  await iter.dispose()
+  return success res
 
 proc defaultDispose(): Future[?!void] {.upraises: [], gcsafe, async.} =
   return success()

tests/datastore/querycommontests.nim

@@ -68,10 +68,7 @@ template queryTests*(ds: Datastore, extended = true) {.dirty.} =
     (await ds.put(key3, val3)).tryGet
 
     let
-      iter = (await ds.query(q)).tryGet
+      res = tryGet(await ds.query(q).waitForAllQueryResults())
-      res = (await allFinished(toSeq(iter)))
-        .mapIt( it.read.tryGet )
-        .filterIt( it.key.isSome )
 
     check:
       res.len == 3
@@ -84,7 +81,6 @@ template queryTests*(ds: Datastore, extended = true) {.dirty.} =
       res[2].key.get == key3
       res[2].data.len == 0
 
-    (await iter.dispose()).tryGet
 
   test "Key should not query parent":
     let