Merge pull request #143 from itsumura-h/fix_mysql_insert_bool

fix to load .env/fix mysql insert bool

allographer.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.17.1"
+version       = "0.17.2"
 author        = "Hidenobu Itsumura @dumblepytech1 as 'medy'"
 description   = "A Nim query builder library inspired by Laravel/PHP and Orator/Python"
 license       = "MIT"

src/allographer/baseEnv.nim

@@ -0,0 +1,21 @@
+import os, strutils
+import dotenv
+
+for f in walkDir(getCurrentDir()):
+  if f.path.contains(".env"):
+    let env = initDotEnv(getCurrentDir(), f.path.split("/")[^1])
+    env.load()
+    echo("used config file '", f.path, "'")
+
+const
+  DRIVER* = getEnv("DB_DRIVER","sqlite").string
+
+let
+  CONN* = getEnv("DB_CONNECTION", getCurrentDir() / "db.sqlite3").string
+  USER* = getEnv("DB_USER", "").string
+  PASSWORD* = getEnv("DB_PASSWORD", "").string
+  DATABASE* = getEnv("DB_DATABASE", "").string
+  MAX_CONNECTION* = getEnv("DB_MAX_CONNECTION", "1").parseInt
+  IS_DISPLAY* = if existsEnv("LOG_IS_DISPLAY"): getEnv("LOG_IS_DISPLAY").string.parseBool else: false
+  IS_FILE* = if existsEnv("LOG_IS_FILE"): getEnv("LOG_IS_FILE").string.parseBool else: false
+  LOG_DIR* = if existsEnv("LOG_DIR"): getEnv("LOG_DIR").string else: ""

src/allographer/connection.nim

@@ -1,20 +1,5 @@
 import os, strutils
-import dotenv
-
-const
-  DRIVER = getEnv("DB_DRIVER","sqlite").string
-
-for f in walkDirRec(getCurrentDir(), {pcFile}):
-  if f.contains(".env"):
-    let env = initDotEnv(getCurrentDir(), f.split("/")[^1])
-    env.load()
-
-let
-  CONN = getEnv("DB_CONNECTION", getCurrentDir() / "db.sqlite3").string
-  USER = getEnv("DB_USER", "").string
-  PASSWORD = getEnv("DB_PASSWORD", "").string
-  DATABASE = getEnv("DB_DATABASE", "").string
-  MAX_CONNECTION* = getEnv("DB_MAX_CONNECTION", "1").parseInt
+import baseEnv
 
 when DRIVER == "sqlite":
   import db_sqlite

src/allographer/query_builder/generators.nim

@@ -283,7 +283,12 @@ proc insertValueSql*(this: RDB, items: JsonNode): RDB =
     elif val.kind == JFloat:
       this.placeHolder.add($(val.getFloat()))
     elif val.kind == JBool:
-      this.placeHolder.add($(val.getBool()))
+      let val =
+        if val.getBool():
+          1
+        else:
+          0
+      this.placeHolder.add($val)
     elif val.kind == JObject:
       this.placeHolder.add($val)
     else:
@@ -319,7 +324,12 @@ proc insertValuesSql*(this: RDB, rows: openArray[JsonNode]): RDB =
       elif val.kind == JFloat:
         this.placeHolder.add($(val.getFloat()))
       elif val.kind == JBool:
-        this.placeHolder.add($(val.getBool()))
+        let val =
+          if val.getBool():
+            1
+          else:
+            0
+        this.placeHolder.add($val)
       elif val.kind == JObject:
         this.placeHolder.add($val)
       else:

src/allographer/utils.nim

@@ -1,13 +1,8 @@
 import os, parsecfg, terminal, logging, macros, strformat, strutils
 # self
+import baseEnv
 from connection import getDriver
 
-const
-  IS_DISPLAY = when existsEnv("LOG_IS_DISPLAY"): getEnv("LOG_IS_DISPLAY").string.parseBool else: false
-  IS_FILE = when existsEnv("LOG_IS_FILE"): getEnv("LOG_IS_FILE").string.parseBool else: false
-  LOG_DIR = when existsEnv("LOG_DIR"): getEnv("LOG_DIR").string else: ""
-
-
 proc driverTypeError*() =
   let driver = getDriver()
   if driver != "sqlite" and driver != "mysql" and driver != "postgres":
@@ -67,13 +62,7 @@ proc liteWrapUpper(input:var string) =
     input = &"\"{input}\""
 
 proc myWrapUpper(input:var string) =
-  var isUpper = false
-  for c in input:
-    if c.isUpperAscii():
-      isUpper = true
-      break
-  if isUpper:
-    input = &"`{input}`"
+  input = &"`{input}`"
 
 proc pgWrapUpper(input:var string) =
   var isUpper = false

tests/test_schema_builder.nim

@@ -1,5 +1,6 @@
-import unittest, json
+import unittest, json, times
 import ../src/allographer/schema_builder
+import ../src/allographer/query_builder
 
 
 suite "Schema builder":
@@ -18,7 +19,7 @@ suite "Schema builder":
 
         Column().char("char", 100).unique().default("").unsigned().index(),
         Column().string("string").unique().default("").unsigned().index(),
-        Column().text("text").default("").unique().default("").unsigned().index(),
+        Column().text("text").unique().default("").unsigned().index(),
         Column().mediumText("mediumText").unique().default("").unsigned().index(),
         Column().longText("longText").unique().default("").unsigned().index(),
 
@@ -95,3 +96,36 @@ suite "Schema builder":
       #   Column().json("json").default(%*{"key": "value"}),
       # ], reset=true)
     ])
+
+  test "insert":
+    try:
+      rdb().table("sqlite").insert(%*{
+        "increments": 1,
+        "integer": 1,
+        "smallInteger": 1,
+        "mediumInteger": 1,
+        "bigInteger": 1,
+        "decimal": 111.11,
+        "double": 111.11,
+        "float": 111.11,
+        "char": "a",
+        "string": "a",
+        "text": "a",
+        "mediumText": "a",
+        "longText": "a",
+        "date": "2020-01-01".parse("yyyy-MM-dd").format("yyyy-MM-dd"),
+        "datetime": "2020-01-01".parse("yyyy-MM-dd").format("yyyy-MM-dd HH:MM:ss"),
+        "time": "2020-01-01".parse("yyyy-MM-dd").format("HH:MM:ss"),
+        "timestamp": "2020-01-01".parse("yyyy-MM-dd").format("yyyy-MM-dd HH:MM:ss"),
+        "binary": "a",
+        "boolean": true,
+        "enumField": "a",
+        "json": {"key": "value"}
+      })
+      assert true
+      alter(
+        drop("sqlite")
+      )
+    except:
+      echo getCurrentExceptionMsg()
+      assert false