fix sqlite query #235

example/rearchtect.nim

@@ -0,0 +1,48 @@
+import std/asyncdispatch
+import std/json
+import std/httpclient
+import std/streams
+import std/options
+import ../src/allographer/connection
+import ../src/allographer/query_builder
+
+
+proc main() {.async.} =
+  let client = newAsyncHttpClient()
+  let response = client.getContent("https://nim-lang.org/assets/img/twitter_banner.png").await
+  let imageStream = newStringStream(response)
+  let binaryImage = imageStream.readAll()
+
+
+  let rdb = dbOpen(SQLite3, "/root/project/db.sqlite3", shouldDisplayLog=true)
+  echo rdb.type
+
+  rdb.raw("DROP TABLE IF EXISTS \"test\"").exec().await
+
+  rdb.raw("""
+    CREATE TABLE IF NOT EXISTS "test" (
+      'id' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+      'blob' BLOB,
+      'int' INTEGER,
+      'float' NUMERIC,
+      'str' VARCHAR
+    )"""
+  ).exec().await
+
+  rdb.table("test").insert(%*{"blob":binaryImage, "int": 1, "float": 1.1, "str": "alice"}).await
+
+  let res = rdb.table("test").select("id", "int", "float", "str").get().await
+  for row in res:
+    echo row
+
+  var row = rdb.table("test").select("id", "int", "float", "str").first().await
+  if row.isSome:
+    echo row.get
+
+  rdb.table("test").where("id", "=", 1).update(%*{"str": "bob"}).await
+
+  row = rdb.table("test").select("id", "int", "float", "str").find(1).await
+  if row.isSome:
+    echo row.get
+
+main().waitFor

example/sqlite_binary.nim → example/sqlite/sqlite_binary.nim

@@ -4,9 +4,13 @@ import std/asyncdispatch
 import std/httpclient
 import std/json
 import std/streams
+import ../src/allographer/connection
+import ../src/allographer/query_builder/rdb/rdb_types
+import ../src/allographer/query_builder/rdb/query/grammar
+import ../src/allographer/query_builder/rdb/rdb_interface
 import ../src/allographer/query_builder/rdb/databases/database_types
 import ../src/allographer/query_builder/rdb/databases/sqlite/sqlite_rdb
-import ../src/allographer/query_builder/rdb/databases/sqlite/sqlite_lib
+# import ../src/allographer/query_builder/rdb/databases/sqlite/sqlite_lib
 import ../src/allographer/query_builder/rdb/databases/sqlite/sqlite_impl
 
 
@@ -77,4 +81,16 @@ proc main(){.async.} =
   if not res:
     dbError(db)
 
-main().waitFor
+
+proc useAllographer() {.async.} =
+  let client = newAsyncHttpClient()
+  let response = client.getContent("https://nim-lang.org/assets/img/twitter_banner.png").await
+  let imageStream = newStringStream(response)
+  let binaryImage = imageStream.readAll()
+
+  let rdb = dbOpen(SQLite3, "/root/project/db.sqlite3")
+  rdb.table("test").insert(%*{"blob": binaryImage, "int": 100, "float": 1.1, "str": "alice"}).await
+
+
+# main().waitFor
+useAllographer().waitFor

example/sqlite/sqlite_test1.nim

@@ -0,0 +1,69 @@
+import std/asyncdispatch
+import std/httpclient
+import std/streams
+import std/json
+import ../../src/allographer/connection
+import ../../src/allographer/query_builder
+
+
+proc main() {.async.} =
+  let client = newAsyncHttpClient()
+  let response = client.getContent("https://nim-lang.org/assets/img/twitter_banner.png").await
+  let imageStream = newStringStream(response)
+  let binaryImage = imageStream.readAll()
+
+  let rdb = dbOpen(SQLite3, "/root/project/db.sqlite3", shouldDisplayLog=true)
+  await rdb.raw("DROP TABLE IF EXISTS \"test\"").exec()
+  await rdb.raw("""
+    CREATE TABLE IF NOT EXISTS "test" (
+      'id' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+      'bool' TINYINT,
+      'int' INTEGER,
+      'float' NUMERIC,
+      'str' VARCHAR,
+      'json' VARCHAR,
+      'null' VARCHAR,
+      'blob' BLOB
+    )
+  """).exec()
+
+  await rdb.table("test").insert(%*{
+    "blob": binaryImage,
+    "bool": true,
+    "int": 1,
+    "float": 1.1,
+    "str": "alice",
+    "json": {"name":"alice", "email":"[email protected]"},
+    "null": nil
+  })
+  echo rdb.table("test").get().await
+  echo rdb.select("id", "str").table("test").get().await
+
+  await rdb.table("test").where("id", "=", 1).update(%*{
+    "blob": binaryImage,
+    "bool": false,
+    "int": 2,
+    "float": 2.1,
+    "json": {"name":"bob", "email":"[email protected]"},
+    "str": "bob",
+  })
+  echo rdb.table("test").get().await
+
+  await rdb.raw(
+    """
+      UPDATE "test"
+      SET
+        `bool` = ?,
+        `int` = ?,
+        `float` = ?,
+        `json` = ?,
+        `str` = ?,
+        `null` = ?
+      WHERE `id` = ?
+    """,
+    %*[true, 3, 3.3, {"name":"charlie", "email":"[email protected]"}, "charlie", nil, 1]
+  ).exec()
+  echo rdb.raw("SELECT * FROM \"test\"").get().await
+
+
+main().waitFor()

src/allographer/connection.nim

@@ -1,30 +1,16 @@
 import std/asyncdispatch
 import std/json
 import ./query_builder/log
-import ./query_builder/rdb/rdb_types
-import ./query_builder/rdb/query/exec
-import ./query_builder/surreal/surreal_types
-import ./query_builder/surreal/databases/surreal_impl
+import ./query_builder/models/sqlite/sqlite_types
+import ./query_builder/models/sqlite/sqlite_open
+import ./query_builder/models/sqlite/sqlite_connections
 
 export
-  Driver,
-  SurrealDb
+  SQLite3
 
-proc dbOpen*(driver:Driver, database="", user="", password="",
-            host="", port=0, maxConnections=1, timeout=30,
-            shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""):Rdb =
-  result = new Rdb
-  result.driver = driver
-  result.conn = open(driver, database, user, password, host, port, maxConnections, timeout)
-  result.log = LogSetting(shouldDisplayLog:shouldDisplayLog, shouldOutputLogFile:shouldOutputLogFile, logDir:logDir)
-  result.query = newJObject()
-  result.isInTransaction = false
 
-proc dbOpen*(_:type SurrealDb, namespace="", database="", user="", password="",
-            host="", port=0, maxConnections=1, timeout=30,
-            shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""):Future[SurrealDb] {.async.} =
-  result = new SurrealDb
-  result.conn = await SurrealImpl.open(namespace, database, user, password, host, port.int32, maxConnections, timeout)
+proc dbOpen*(driver:type SQLite3, database="", user="", password="",
+            host="", port:int32=0, maxConnections=1, timeout=30,
+            shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""):SqliteConnections =
+  result = sqliteOpen(database, user, password, host, port, maxConnections, timeout)
   result.log = LogSetting(shouldDisplayLog:shouldDisplayLog, shouldOutputLogFile:shouldOutputLogFile, logDir:logDir)
-  result.query = newJObject()
-  result.isInTransaction = false

src/allographer/connection.nim.bk

@@ -0,0 +1,30 @@
+import std/asyncdispatch
+import std/json
+import ./query_builder/log
+import ./query_builder/rdb/rdb_types
+import ./query_builder/rdb/query/exec
+import ./query_builder/surreal/surreal_types
+import ./query_builder/surreal/databases/surreal_impl
+
+export
+  Driver,
+  SurrealDb
+
+proc dbOpen*(driver:Driver, database="", user="", password="",
+            host="", port=0, maxConnections=1, timeout=30,
+            shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""):Rdb =
+  result = new Rdb
+  result.driver = driver
+  result.conn = open(driver, database, user, password, host, port, maxConnections, timeout)
+  result.log = LogSetting(shouldDisplayLog:shouldDisplayLog, shouldOutputLogFile:shouldOutputLogFile, logDir:logDir)
+  result.query = newJObject()
+  result.isInTransaction = false
+
+proc dbOpen*(_:type SurrealDb, namespace="", database="", user="", password="",
+            host="", port=0, maxConnections=1, timeout=30,
+            shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""):Future[SurrealDb] {.async.} =
+  result = new SurrealDb
+  result.conn = await SurrealImpl.open(namespace, database, user, password, host, port.int32, maxConnections, timeout)
+  result.log = LogSetting(shouldDisplayLog:shouldDisplayLog, shouldOutputLogFile:shouldOutputLogFile, logDir:logDir)
+  result.query = newJObject()
+  result.isInTransaction = false

src/allographer/query_builder.bk/enums.nim

@@ -0,0 +1,8 @@
+type Order* = enum
+  Asc = "ASC"
+  Desc = "DESC"
+
+type Collation* = enum
+  None = ""
+  Collate = "COLLATE"
+  Numeric = "NUMERIC"

src/allographer/query_builder.bk/error.nim

@@ -0,0 +1,9 @@
+type
+  DbError* = object of IOError ## exception that is raised if a database error occurs
+
+proc dbError*(msg: string) {.noreturn, noinline.} =
+  ## raises an DbError exception with message `msg`.
+  var e: ref DbError
+  new(e)
+  e.msg = msg
+  raise e