More tests

Author: ThomasTJdev

sqlbuilder.nimble

@@ -28,6 +28,7 @@ task testlegacy, "Test legacy":
 
 proc runSelect() =
   exec "nim c -d:dev -r tests/select/test_select.nim"
+  exec "nim c -d:dev -r tests/select/test_select_arrays.nim"
   exec "nim c -d:dev -r tests/select/test_select_deletemarker.nim"
   exec "nim c -d:dev -r tests/select/test_select_const.nim"
   exec "nim c -d:dev -r tests/select/test_select_const_deletemarker.nim"
@@ -37,6 +38,7 @@ task testselect, "Test select statement":
 
 
 proc runInsert() =
+  exec "nim c -d:dev -r tests/insert/test_insert_db.nim"
   exec "nim c -d:dev -r tests/insert/test_insert.nim"
 
 task testinsert, "Test insert statement":

src/sqlbuilderpkg/select.nim

@@ -366,7 +366,9 @@ macro sqlSelectConst*(
 
 
 
-
+##
+## Default select generator
+##
 proc sqlSelect*(
     # BASE
     table: string,

tests/insert/test_insert.nim

@@ -69,18 +69,35 @@ suite "insert - default":
 
 
 
-  test "empty value transform to NULL":
+  test "empty value transform to NULL #1":
     var test: SqlQuery
 
     test = sqlInsert("my-table", ["name", "age"], @["", "30"])
     check querycompare(test, sql("INSERT INTO my-table (name, age) VALUES (NULL, ?)"))
 
-  test "empty value transform to NULL":
+  test "empty value transform to NULL #2":
     var test: SqlQuery
 
     test = sqlInsert("my-table", ["name", "age"], @["", ""])
     check querycompare(test, sql("INSERT INTO my-table (name, age) VALUES (NULL, NULL)"))
 
+  test "empty value transform to NULL #3":
+    var test: SqlQuery
+
+    test = sqlInsert("my-table", ["name", "age", "company", "ident"], @["john", "23", "", "ok"])
+    check querycompare(test, sql("INSERT INTO my-table (name, age, company, ident) VALUES (?, ?, NULL, ?)"))
+
+  test "empty value transform to NULL #5":
+    var test: SqlQuery
+
+    test = sqlInsert("my-table", ["name", "age", "company", "ident"], @["", "", "", ""])
+    check querycompare(test, sql("INSERT INTO my-table (name, age, company, ident) VALUES (NULL, NULL, NULL, NULL)"))
+
+  test "empty value transform to NULL #4":
+    var test: SqlQuery
+
+    test = sqlInsert("my-table", ["name", "age", "company", "ident"], @["john", "", "", "ok"])
+    check querycompare(test, sql("INSERT INTO my-table (name, age, company, ident) VALUES (?, NULL, NULL, ?)"))
 
 
 suite "insert - macro":

tests/insert/test_insert_db.nim

@@ -0,0 +1,43 @@
+# Copyright Thomas T. Jarløv (TTJ) - ttj@ttj.dk
+
+when NimMajor >= 2:
+  import
+    db_connector/db_sqlite
+else:
+  import
+    std/db_sqlite
+
+import
+  std/strutils,
+  std/unittest
+
+import
+  src/sqlbuilder,
+  src/sqlbuilderpkg/utils_private
+
+
+import tests/create_db
+
+
+
+
+suite "insert into db":
+  test "empty value transform to NULL #5":
+
+    createDB()
+
+    let db = openDB()
+
+    check tryInsertID(db,
+            sqlInsert("my_table",
+            ["name", "age", "ident"],
+            @["john", "", ""]), @["john", "", ""]
+      ) > 0
+
+    echo tryInsertID(db,
+            sqlInsert("my_table",
+            ["name", "age", "ident"],
+            @["john", "12", ""]), @["john", "", ""]
+      )
+
+

tests/select/test_select.nim

@@ -577,3 +577,8 @@ suite "catch bad formats":
 
 
 
+
+
+
+
+

tests/select/test_select_arrays.nim

@@ -0,0 +1,59 @@
+# Copyright Thomas T. Jarløv (TTJ)
+
+when NimMajor >= 2:
+  import db_connector/db_common
+else:
+  import std/db_common
+
+import
+  std/strutils,
+  std/unittest
+
+import
+  src/sqlbuilder,
+  src/sqlbuilderpkg/utils_private
+
+
+
+suite "sqlSelect - array formatting":
+
+  test "setting type int":
+
+    let test = sqlSelect(
+      table     = "tasks",
+      select    = @["id", "name"],
+      where     = @["some_ids = ANY(?::INT[])"],
+    )
+    check querycompare(test, sql("SELECT id, name FROM tasks WHERE some_ids = ANY(?::INT[])"))
+
+
+  test "setting type int multiple times":
+
+    let test = sqlSelect(
+      table     = "tasks",
+      select    = @["id", "name"],
+      where     = @[
+        "some_ids = ANY(?::INT[])",
+        "hash_ids = ANY(?::INT[])",
+        "version =",
+        "revisions = ANY(?::INT[])"
+      ],
+    )
+    check querycompare(test, sql("SELECT id, name FROM tasks WHERE some_ids = ANY(?::INT[]) AND hash_ids = ANY(?::INT[]) AND version = ? AND revisions = ANY(?::INT[])"))
+
+
+  test "setting type int + text multiple times":
+
+    let test = sqlSelect(
+      table     = "tasks",
+      select    = @["id", "name"],
+      where     = @[
+        "some_ids = ANY(?::TEXT[])",
+        "hash_ids = ANY(?::INT[])",
+        "version =",
+        "revisions = ANY(?::TEXT[])"
+      ],
+    )
+    check querycompare(test, sql("SELECT id, name FROM tasks WHERE some_ids = ANY(?::TEXT[]) AND hash_ids = ANY(?::INT[]) AND version = ? AND revisions = ANY(?::TEXT[])"))
+
+