Merge pull request #5 from bung87/refactor4

rename `updateWhere`  to `sqlWhere` , refactor `delete`'s `where` clause

Author: ThomasTJdev

src/sqlbuilderpkg/delete.nim

@@ -19,38 +19,26 @@ proc sqlDelete*(table: string, where: varargs[string]): SqlQuery =
   ## Does NOT check for NULL values
 
   var res = "DELETE FROM " & table
-  var wes = " WHERE "
-  for i, d in where:
-    if i > 0:
-      wes.add(" AND ")
-    wes.add(formatWhereParams(d))
-  result = sql(res & wes)
+  if where.len > 0:
+    res.add sqlWhere(where)
+  result = sql(res)
 
 
 proc sqlDelete*(table: string, where: varargs[string], args: ArgsContainer.query): SqlQuery =
   ## SQL builder for DELETE queries
   ## Checks for NULL values
 
   var res = "DELETE FROM " & table
-  var wes = " WHERE "
-  for i, d in where:
-    if i > 0:
-      wes.add(" AND ")
-    if args[i].isNull:
-      wes.add(d & " = NULL")
-    else:
-      wes.add(d & " = ?")
-  result = sql(res & wes)
+  if where.len > 0:
+    res.add(sqlWhere(where))
+  result = sql(res)
 
 
 macro sqlDeleteMacro*(table: string, where: varargs[string]): SqlQuery =
   ## SQL builder for SELECT queries
   ## Does NOT check for NULL values
 
   var res = "DELETE FROM " & $table
-  var wes = " WHERE "
-  for i, d in where:
-    if i > 0:
-      wes.add(" AND ")
-    wes.add(formatWhereParams($d))
-  result = parseStmt("sql(\"" & res & wes & "\")")
+  if where.len > 0:
+    res.add sqlWhere(where)
+  result = parseStmt("sql(\"" & res & "\")")

src/sqlbuilderpkg/update.nim

@@ -72,22 +72,6 @@ proc updateArray(arrayType: string, arrayAppend: varargs[string]): string =
   return result
 
 
-proc updateWhere(where: varargs[string]): string =
-  ## Update the WHERE part of the query.
-  ##
-  ## => ["name", "age = "]
-  ## => `WHERE name = ?, age = ?`
-  ##
-  ## => ["name = ", "age >"]
-  ## => `WHERE name = ?, age > ?`
-  var wes = " WHERE "
-  for i, v in where:
-    if i > 0:
-      wes.add(" AND ")
-    wes.add(formatWhereParams(v))
-  return wes
-
-
 proc sqlUpdate*(table: string, data: varargs[string], where: varargs[string], args: ArgsContainer.query): SqlQuery =
   ## SQL builder for UPDATE queries
   ## Checks for NULL values
@@ -130,7 +114,7 @@ proc sqlUpdate*(
   ## where => ["id = ", "name IS NULL"]
   var fields: string
   fields.add(updateSet(data))
-  fields.add(updateWhere(where))
+  fields.add(sqlWhere(where))
   result = sql("UPDATE " & table & " SET " & fields)
 
 
@@ -142,7 +126,7 @@ proc sqlUpdateArrayRemove*(
   ## ARRAY_REMOVE
   var fields: string
   fields.add(updateArray("ARRAY_REMOVE", arrayRemove))
-  fields.add(updateWhere(where))
+  fields.add(sqlWhere(where))
   result = sql("UPDATE " & table & " SET " & fields)
 
 
@@ -154,7 +138,7 @@ proc sqlUpdateArrayAppend*(
   ## ARRAY_APPEND
   var fields: string
   fields.add(updateArray("ARRAY_APPEND", arrayAppend))
-  fields.add(updateWhere(where))
+  fields.add(sqlWhere(where))
   result = sql("UPDATE " & table & " SET " & fields)
 
 
@@ -179,26 +163,6 @@ proc updateSet(data: NimNode): string =
   return result
 
 
-
-proc updateWhere(where: NimNode): string =
-  ## Update the WHERE part of the query.
-  ##
-  ## => ["name", "age = "]
-  ## => `WHERE name = ?, age = ?`
-  ##
-  ## => ["name = ", "age >"]
-  ## => `WHERE name = ?, age > ?`
-  var wes = " WHERE "
-  for i, v in where:
-    # Convert NimNode to string
-    let d = $v
-    if i > 0:
-      wes.add(" AND ")
-    wes.add(formatWhereParams(d))
-  return wes
-
-
-
 macro sqlUpdateMacro*(
     table: string,
     data: varargs[string],
@@ -212,7 +176,7 @@ macro sqlUpdateMacro*(
   ## where => ["id = ", "name IS NULL"]
   var fields: string
   fields.add(updateSet(data))
-  fields.add(updateWhere(where))
+  fields.add(sqlWhere(where))
   result = parseStmt("sql(\"" & "UPDATE " & $table & " SET " & fields & "\")")
 
 
@@ -243,7 +207,7 @@ macro sqlUpdateMacroArrayRemove*(
   ## ARRAY_REMOVE macro
   var fields: string
   fields.add(updateArray("ARRAY_REMOVE", arrayRemove))
-  fields.add(updateWhere(where))
+  fields.add(sqlWhere(where))
   result = parseStmt("sql(\"" & "UPDATE " & $table & " SET " & fields & "\")")
 
 
@@ -255,5 +219,5 @@ macro sqlUpdateMacroArrayAppend*(
   ## ARRAY_APPEND macro
   var fields: string
   fields.add(updateArray("ARRAY_APPEND", arrayAppend))
-  fields.add(updateWhere(where))
+  fields.add(sqlWhere(where))
   result = parseStmt("sql(\"" & "UPDATE " & $table & " SET " & fields & "\")")

src/sqlbuilderpkg/utils_private.nim

@@ -7,6 +7,7 @@ else:
 
 
 import
+  std/macros,
   std/strutils
 
 
@@ -139,3 +140,34 @@ proc hasIllegalFormats*(query: string): string =
   if "??" in noSpaces:
     return "double insert detected. (??)"
 
+proc sqlWhere*(where: varargs[string]): string =
+  ## the WHERE part of the query.
+  ##
+  ## => ["name", "age = "]
+  ## => `WHERE name = ?, age = ?`
+  ##
+  ## => ["name = ", "age >"]
+  ## => `WHERE name = ?, age > ?`
+  var wes = " WHERE "
+  for i, v in where:
+    if i > 0:
+      wes.add(" AND ")
+    wes.add(formatWhereParams(v))
+  return wes
+
+proc sqlWhere*(where: NimNode): string =
+  ## the WHERE part of the query.
+  ##
+  ## => ["name", "age = "]
+  ## => `WHERE name = ?, age = ?`
+  ##
+  ## => ["name = ", "age >"]
+  ## => `WHERE name = ?, age > ?`
+  var wes = " WHERE "
+  for i, v in where:
+    # Convert NimNode to string
+    let d = $v
+    if i > 0:
+      wes.add(" AND ")
+    wes.add(formatWhereParams(d))
+  return wes

tests/delete/test_delete.nim

@@ -24,6 +24,9 @@ suite "delete - normal":
     test = sqlDelete("my-table", ["name", "age"])
     check querycompare(test, sql("DELETE FROM my-table WHERE name = ? AND age = ?"))
 
+    test = sqlDelete("my-table", [])
+    check querycompare(test, sql("DELETE FROM my-table"))
+
 
   test "sqlDeleteWhere":
     var test: SqlQuery
@@ -64,4 +67,32 @@ suite "delete - macro":
     check querycompare(test, sql("DELETE FROM my-table WHERE name IS NULL AND age = ?"))
 
 
+suite "delete - genArgs":
+
+  test "sqlDelete with genArgs":
+
+    var a = genArgs("123", dbNullVal)
+
+    var test = sqlDelete("tasksQQ", ["id =", "status IS"], a.query)
+
+    check querycompare(test, sql("""DELETE FROM tasksQQ WHERE id = ? AND status IS ?"""))
+
+
+
+    a = genArgs("123", dbNullVal, dbNullVal)
+
+    test = sqlDelete("tasksQQ", ["id =", "status IS NOT", "phase IS"], a.query)
+
+    check querycompare(test, sql("""DELETE FROM tasksQQ WHERE id = ? AND status IS NOT ? AND phase IS ?"""))
+
+
+
+  test "sqlDelete with genArgsSetNull":
+
+    var a = genArgsSetNull("123", "", "")
+
+    var test = sqlDelete("tasksQQ",  ["id =", "status IS NOT", "phase IS"],  a.query)
+
+    check querycompare(test, sql("""DELETE FROM tasksQQ WHERE id = ? AND status IS NOT ? AND phase IS ?"""))
+