From f0fc8ce224ea60cbc1e45c59a1ecb870b3db44b4 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Mon, 25 Sep 2023 16:08:59 -0700
Subject: [PATCH] change to non-closure iterator

---
 datastore/sql/sqliteds.nim           |  1 +
 datastore/threads/databuffer.nim     |  8 --------
 tests/datastore/sql/testsqliteds.nim | 10 +++++-----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/datastore/sql/sqliteds.nim b/datastore/sql/sqliteds.nim
index 8185e57..0673acc 100644
--- a/datastore/sql/sqliteds.nim
+++ b/datastore/sql/sqliteds.nim
@@ -195,6 +195,7 @@ iterator iter*(handle: var DbQueryHandle[RawStmtPtr]): ?!DbQueryResponse =
       # error it is necessary to check that the result is a null pointer and
       # that the result code is an error code
       if blob.isSome and blob.get().isNil:
+        echo "BLOB: isSome"
         let v = sqlite3_errcode(sqlite3_db_handle(handle.env))
 
         if not (v in [SQLITE_OK, SQLITE_ROW, SQLITE_DONE]):
diff --git a/datastore/threads/databuffer.nim b/datastore/threads/databuffer.nim
index 622d137..be08c02 100644
--- a/datastore/threads/databuffer.nim
+++ b/datastore/threads/databuffer.nim
@@ -116,19 +116,11 @@ proc `$`*(data: DataBuffer): string =
   data.toString()
 
 proc `==`*(a, b: DataBuffer): bool =
-  echo "DB == ", a.toString, " ", b.toString
-  echo "DB == len: ", a.len, " ", b.len
-  echo "DB == size: ", a[].size, " ", b[].size
-  echo "DB == cap: ", a[].cap, " ", b[].cap
-  echo "DB == ", a[].buf.pointer.repr, " ", b[].buf.pointer.repr
-  echo "DB == ", a.hash, " ", b.hash
   if a.isNil and b.isNil: result = true
   elif a.isNil or b.isNil: result = false
   elif a[].size != b[].size: result = false
   elif a[].buf == b[].buf: result = true
   else: result = a.hash() == b.hash()
-  echo "DB == ", result
-  echo ""
 
 converter toBuffer*(err: ref CatchableError): DataBuffer =
   ## convert exception to an object with StringBuffer
diff --git a/tests/datastore/sql/testsqliteds.nim b/tests/datastore/sql/testsqliteds.nim
index 25521c5..9dae616 100644
--- a/tests/datastore/sql/testsqliteds.nim
+++ b/tests/datastore/sql/testsqliteds.nim
@@ -123,7 +123,7 @@ suite "queryTests":
 
   test "Key should query all keys and all it's children":
     let
-      q = DbQuery(key: key1)
+      q = DbQuery(key: key1, value: true)
 
     ds.put(key1, val1).tryGet
     ds.put(key2, val2).tryGet
@@ -142,11 +142,11 @@ suite "queryTests":
       res[0].key.get == key1
       res[0].data == val1
 
-      # res[1].key.get == key2
-      # res[1].data == val2
+      res[1].key.get == key2
+      res[1].data == val2
 
-      # res[2].key.get == key3
-      # res[2].data == val3
+      res[2].key.get == key3
+      res[2].data == val3
 
   # test "Key should query all keys without values":
   #   let