From ea3546f5b33b8929cae1906f083c0d87fcf36f95 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Wed, 20 Sep 2023 17:19:03 -0700
Subject: [PATCH] refactor sqliteds

---
 datastore/sql/sqliteds.nim         | 5 +++--
 datastore/threads/threadresult.nim | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/datastore/sql/sqliteds.nim b/datastore/sql/sqliteds.nim
index 8cd7f85..4241292 100644
--- a/datastore/sql/sqliteds.nim
+++ b/datastore/sql/sqliteds.nim
@@ -101,9 +101,10 @@ proc close*(self: SQLiteDatastore): ?!void =
 
   return success()
 
-proc query*(self: SQLiteDatastore,
+
+iterator query*(self: SQLiteDatastore,
               query: Query
-              ): ?!QueryIter {.async.} =
+              ): ?!ThreadQueryRes =
 
   var
     iter = QueryIter()
diff --git a/datastore/threads/threadresult.nim b/datastore/threads/threadresult.nim
index fcb7ffd..07c5108 100644
--- a/datastore/threads/threadresult.nim
+++ b/datastore/threads/threadresult.nim
@@ -22,6 +22,9 @@ type
   ThreadQueryRes* = (DataBuffer, DataBuffer)
   ThreadResult*[T: ThreadTypes] = Result[T, ThreadResErr]
 
+  DbKey* = tuple[data: DataBuffer]
+  DbValue* = tuple[data: DataBuffer]
+
 converter toThreadErr*(e: ref CatchableError): ThreadResErr {.inline, raises: [].} =
   if e of DatastoreKeyNotFound: (ErrorEnum.DatastoreKeyNotFoundErr, DataBuffer.new(e.msg))
   elif e of QueryEndedError: (ErrorEnum.QueryEndedErr, DataBuffer.new(e.msg))