diff --git a/compose.test.yaml b/compose.test.yaml
index 76e4aa18..33c05bce 100644
--- a/compose.test.yaml
+++ b/compose.test.yaml
@@ -5,7 +5,7 @@ services:
       context: .
       dockerfile: ./docker/ubuntu/Dockerfile
       args:
-        VERSION: 1.6.14
+        VERSION: 1.6.16
     tty: true
     volumes:
       - .:/root/project
diff --git a/example/migrate.nim b/example/migrate.nim
index 085886d2..39a454fa 100644
--- a/example/migrate.nim
+++ b/example/migrate.nim
@@ -16,7 +16,7 @@ rdb.create([
     Column.string("oid2").index().nullable(),
     Column.string("Name").nullable(),
     Column.date("birth_date").nullable(),
-    Column.foreign("auth_id").reference("id").on("Auth").onDelete(SET_NULL).default(1)
+    Column.foreign("auth_id").reference("id").onTable("Auth").onDelete(SET_NULL).default(1)
   ]),
 ])
 
@@ -24,17 +24,18 @@ rdb.alter([
   table("Users", [
     # add column
     Column.string("aaa").default("").add(),
-    Column.foreign("bbb").reference("id").on("Auth").onDelete(SET_NULL).add(),
+    Column.foreign("bbb").reference("id").onTable("Auth").onDelete(SET_NULL).add(),
     # change column definition
     Column.string("aaa").nullable().change(),
     # change column name
     Column.renameColumn("aaa", "ccc"),
     # delete column
-    Column.deleteColumn("ccc"),
-    Column.deleteColumn("bbb"),
+    Column.dropColumn("ccc"),
+    Column.dropColumn("bbb"),
   ]),
   # change table name
-  rename("Users", "members"),
-  # drop table
-  drop("members"),
+  table("Users").renameTo("members"),
 ])
+
+# drop table
+rdb.drop(table("members"))
diff --git a/src/allographer/v1/query_builder/libs/mariadb/mariadb_impl.nim b/src/allographer/v1/query_builder/libs/mariadb/mariadb_impl.nim
index 5a150d6d..1e5a9553 100644
--- a/src/allographer/v1/query_builder/libs/mariadb/mariadb_impl.nim
+++ b/src/allographer/v1/query_builder/libs/mariadb/mariadb_impl.nim
@@ -9,27 +9,6 @@ import ./mariadb_rdb
 import ./mariadb_lib
 
 
-# proc dbopen*(database: string = "", user: string = "", password: string = "", host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30): Connections =
-#   var pools = newSeq[Pool](maxConnections)
-#   for i in 0..<maxConnections:
-#     var res = mariadb_rdb.init(nil)
-#     if res == nil:
-#       dbError("could not open database connection")
-#     if mariadb_rdb.realConnect(res, host, user, password, database, port, nil, 0) == nil:
-#       var errmsg = $mariadb_rdb.error(res)
-#       mariadb_rdb.close(res)
-#       dbError(errmsg)
-#     pools[i] = Pool(
-#       mariadbConn: res,
-#       isBusy: false,
-#       createdAt: getTime().toUnix(),
-#     )
-#   result = Connections(
-#     pools: pools,
-#     timeout: timeout
-#   )
-
-
 proc rawExec(conn:PMySQL, query: string, args: seq[string]) =
   assert conn.ping == 0
 
diff --git a/src/allographer/v1/query_builder/libs/mysql/mysql_impl.nim b/src/allographer/v1/query_builder/libs/mysql/mysql_impl.nim
index 6e742a6a..0ad8cf52 100644
--- a/src/allographer/v1/query_builder/libs/mysql/mysql_impl.nim
+++ b/src/allographer/v1/query_builder/libs/mysql/mysql_impl.nim
@@ -9,27 +9,6 @@ import ./mysql_rdb
 import ./mysql_lib
 
 
-# proc dbopen*(database: string = "", user: string = "", password: string = "", host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30): Connections =
-#   var pools = newSeq[Pool](maxConnections)
-#   for i in 0..<maxConnections:
-#     var res = mysql_rdb.init(nil)
-#     if res == nil:
-#       dbError("could not open database connection")
-#     if mysql_rdb.realConnect(res, host, user, password, database, port, nil, 0) == nil:
-#       var errmsg = $mysql_rdb.error(res)
-#       mysql_rdb.close(res)
-#       dbError(errmsg)
-#     pools[i] = Pool(
-#       mysqlConn: res,
-#       isBusy: false,
-#       createdAt: getTime().toUnix(),
-#     )
-#   result = Connections(
-#     pools: pools,
-#     timeout: timeout
-#   )
-
-
 proc rawExec(conn:PMySQL, query: string, args: seq[string]) =
   assert conn.ping == 0
 
diff --git a/src/allographer/v1/query_builder/models/mariadb/mariadb_open.nim b/src/allographer/v1/query_builder/models/mariadb/mariadb_open.nim
index bb406f53..61225cef 100644
--- a/src/allographer/v1/query_builder/models/mariadb/mariadb_open.nim
+++ b/src/allographer/v1/query_builder/models/mariadb/mariadb_open.nim
@@ -6,7 +6,7 @@ import ./mariadb_types
 
 
 proc dbOpen*(_: type MariaDB, database: string = "", user: string = "", password: string = "",
-                  host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+                  host: string = "", port: int = 0, maxConnections: int = 1, timeout=30,
                   shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): MariadbConnections =
   var pools = newSeq[MariadbConnection](maxConnections)
   for i in 0..<maxConnections:
@@ -14,7 +14,7 @@ proc dbOpen*(_: type MariaDB, database: string = "", user: string = "", password
     if conn == nil:
       mariadb_rdb.close(conn)
       dbError("mariadb_rdb.init() failed")
-    if mariadb_rdb.real_connect(conn, host, user, password, database, port, nil, 0) == nil:
+    if mariadb_rdb.real_connect(conn, host, user, password, database, port.int32, nil, 0) == nil:
       var errmsg = $mariadb_rdb.error(conn)
       mariadb_rdb.close(conn)
       dbError(errmsg)
diff --git a/src/allographer/v1/query_builder/models/mysql/mysql_open.nim b/src/allographer/v1/query_builder/models/mysql/mysql_open.nim
index e7f1b4ea..28e8185a 100644
--- a/src/allographer/v1/query_builder/models/mysql/mysql_open.nim
+++ b/src/allographer/v1/query_builder/models/mysql/mysql_open.nim
@@ -6,7 +6,7 @@ import ./mysql_types
 
 
 proc dbOpen*(_:type MySQL, database: string = "", user: string = "", password: string = "",
-              host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+              host: string = "", port: int = 0, maxConnections: int = 1, timeout=30,
               shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): MysqlConnections =
   var pools = newSeq[MysqlConnection](maxConnections)
   for i in 0..<maxConnections:
@@ -14,7 +14,7 @@ proc dbOpen*(_:type MySQL, database: string = "", user: string = "", password: s
     if conn == nil:
       mysql_rdb.close(conn)
       dbError("mysql_rdb.init() failed")
-    if mysql_rdb.real_connect(conn, host, user, password, database, port, nil, 0) == nil:
+    if mysql_rdb.real_connect(conn, host, user, password, database, port.int32, nil, 0) == nil:
       var errmsg = $mysql_rdb.error(conn)
       mysql_rdb.close(conn)
       dbError(errmsg)
diff --git a/src/allographer/v1/query_builder/models/postgres/postgres_open.nim b/src/allographer/v1/query_builder/models/postgres/postgres_open.nim
index f95e4302..53d4eb3c 100644
--- a/src/allographer/v1/query_builder/models/postgres/postgres_open.nim
+++ b/src/allographer/v1/query_builder/models/postgres/postgres_open.nim
@@ -6,7 +6,7 @@ import ./postgres_types
 
 
 proc dbOpen*(_:type PostgreSQL, database: string = "", user: string = "", password: string = "",
-                    host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+                    host: string = "", port: int = 0, maxConnections: int = 1, timeout=30,
                     shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): PostgresConnections =
   var pools = newSeq[PostgresConnection](maxConnections)
   for i in 0..<maxConnections:
diff --git a/src/allographer/v1/query_builder/models/sqlite/sqlite_open.nim b/src/allographer/v1/query_builder/models/sqlite/sqlite_open.nim
index c3d2b1fb..a09833b4 100644
--- a/src/allographer/v1/query_builder/models/sqlite/sqlite_open.nim
+++ b/src/allographer/v1/query_builder/models/sqlite/sqlite_open.nim
@@ -4,8 +4,8 @@ import ../../log
 import ./sqlite_types
 
 
-proc dbOpen*(_:type SQLite3, database: string = "", user: string = "", password: string = "",
-              host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+proc dbOpen*(_:type SQLite3, database: string = "",
+              maxConnections: int = 1, timeout=30,
               shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): SqliteConnections =
   var pools = newSeq[SqliteConnection](maxConnections)
   for i in 0..<maxConnections:
diff --git a/src/allographer/v1/query_builder/models/surreal/surreal_open.nim b/src/allographer/v1/query_builder/models/surreal/surreal_open.nim
index 21b1d83c..fff285c8 100644
--- a/src/allographer/v1/query_builder/models/surreal/surreal_open.nim
+++ b/src/allographer/v1/query_builder/models/surreal/surreal_open.nim
@@ -11,7 +11,7 @@ import ./surreal_types
 
 
 proc dbOpen*(_:type SurrealDB, namespace:string = "", database: string = "", user: string = "", password: string = "",
-              host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+              host: string = "", port: int = 0, maxConnections: int = 1, timeout=30,
               shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): Future[SurrealConnections] {.async.} =
   var pools = newSeq[SurrealConnection](maxConnections)
   for i in 0..<maxConnections:
@@ -36,7 +36,7 @@ proc dbOpen*(_:type SurrealDB, namespace:string = "", database: string = "", use
     let conn = SurrealConn(
       client: client,
       host: host,
-      port: port
+      port: port.int32
     )
 
     pools[i] = SurrealConnection(
diff --git a/src/allographer/v1/schema_builder/models/column.nim b/src/allographer/v1/schema_builder/models/column.nim
index 616150cd..ccecfacf 100644
--- a/src/allographer/v1/schema_builder/models/column.nim
+++ b/src/allographer/v1/schema_builder/models/column.nim
@@ -286,6 +286,11 @@ proc on*(self:Column, table:string):Column {.deprecated: "Use `onTable` instead
   return self
 
 
+proc onTable*(self:Column, table:string):Column =
+  self.info["table"] = %*table
+  return self
+
+
 proc onDelete*(self:Column, kind:ForeignOnDelete):Column =
   self.foreignOnDelete = kind
   return self
diff --git a/src/allographer/v2/query_builder/libs/mariadb/mariadb_impl.nim b/src/allographer/v2/query_builder/libs/mariadb/mariadb_impl.nim
index 11e88d7b..fd1ff596 100644
--- a/src/allographer/v2/query_builder/libs/mariadb/mariadb_impl.nim
+++ b/src/allographer/v2/query_builder/libs/mariadb/mariadb_impl.nim
@@ -9,27 +9,6 @@ import ./mariadb_rdb
 import ./mariadb_lib
 
 
-# proc dbopen*(database: string = "", user: string = "", password: string = "", host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30): Connections =
-#   var pools = newSeq[Pool](maxConnections)
-#   for i in 0..<maxConnections:
-#     var res = mariadb_rdb.init(nil)
-#     if res == nil:
-#       dbError("could not open database connection")
-#     if mariadb_rdb.realConnect(res, host, user, password, database, port, nil, 0) == nil:
-#       var errmsg = $mariadb_rdb.error(res)
-#       mariadb_rdb.close(res)
-#       dbError(errmsg)
-#     pools[i] = Pool(
-#       mariadbConn: res,
-#       isBusy: false,
-#       createdAt: getTime().toUnix(),
-#     )
-#   result = Connections(
-#     pools: pools,
-#     timeout: timeout
-#   )
-
-
 proc rawExec(conn:PMySQL, query: string, args: seq[string]) =
   assert conn.ping == 0
 
diff --git a/src/allographer/v2/query_builder/libs/mysql/mysql_impl.nim b/src/allographer/v2/query_builder/libs/mysql/mysql_impl.nim
index c48c0a10..f9f3c743 100644
--- a/src/allographer/v2/query_builder/libs/mysql/mysql_impl.nim
+++ b/src/allographer/v2/query_builder/libs/mysql/mysql_impl.nim
@@ -9,27 +9,6 @@ import ./mysql_rdb
 import ./mysql_lib
 
 
-# proc dbopen*(database: string = "", user: string = "", password: string = "", host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30): Connections =
-#   var pools = newSeq[Pool](maxConnections)
-#   for i in 0..<maxConnections:
-#     var res = mysql_rdb.init(nil)
-#     if res == nil:
-#       dbError("could not open database connection")
-#     if mysql_rdb.realConnect(res, host, user, password, database, port, nil, 0) == nil:
-#       var errmsg = $mysql_rdb.error(res)
-#       mysql_rdb.close(res)
-#       dbError(errmsg)
-#     pools[i] = Pool(
-#       mysqlConn: res,
-#       isBusy: false,
-#       createdAt: getTime().toUnix(),
-#     )
-#   result = Connections(
-#     pools: pools,
-#     timeout: timeout
-#   )
-
-
 proc rawExec(conn:PMySQL, query: string, args: seq[string]) =
   assert conn.ping == 0
 
diff --git a/src/allographer/v2/query_builder/models/mariadb/mariadb_open.nim b/src/allographer/v2/query_builder/models/mariadb/mariadb_open.nim
index bb406f53..61225cef 100644
--- a/src/allographer/v2/query_builder/models/mariadb/mariadb_open.nim
+++ b/src/allographer/v2/query_builder/models/mariadb/mariadb_open.nim
@@ -6,7 +6,7 @@ import ./mariadb_types
 
 
 proc dbOpen*(_: type MariaDB, database: string = "", user: string = "", password: string = "",
-                  host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+                  host: string = "", port: int = 0, maxConnections: int = 1, timeout=30,
                   shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): MariadbConnections =
   var pools = newSeq[MariadbConnection](maxConnections)
   for i in 0..<maxConnections:
@@ -14,7 +14,7 @@ proc dbOpen*(_: type MariaDB, database: string = "", user: string = "", password
     if conn == nil:
       mariadb_rdb.close(conn)
       dbError("mariadb_rdb.init() failed")
-    if mariadb_rdb.real_connect(conn, host, user, password, database, port, nil, 0) == nil:
+    if mariadb_rdb.real_connect(conn, host, user, password, database, port.int32, nil, 0) == nil:
       var errmsg = $mariadb_rdb.error(conn)
       mariadb_rdb.close(conn)
       dbError(errmsg)
diff --git a/src/allographer/v2/query_builder/models/mysql/mysql_open.nim b/src/allographer/v2/query_builder/models/mysql/mysql_open.nim
index e7f1b4ea..28e8185a 100644
--- a/src/allographer/v2/query_builder/models/mysql/mysql_open.nim
+++ b/src/allographer/v2/query_builder/models/mysql/mysql_open.nim
@@ -6,7 +6,7 @@ import ./mysql_types
 
 
 proc dbOpen*(_:type MySQL, database: string = "", user: string = "", password: string = "",
-              host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+              host: string = "", port: int = 0, maxConnections: int = 1, timeout=30,
               shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): MysqlConnections =
   var pools = newSeq[MysqlConnection](maxConnections)
   for i in 0..<maxConnections:
@@ -14,7 +14,7 @@ proc dbOpen*(_:type MySQL, database: string = "", user: string = "", password: s
     if conn == nil:
       mysql_rdb.close(conn)
       dbError("mysql_rdb.init() failed")
-    if mysql_rdb.real_connect(conn, host, user, password, database, port, nil, 0) == nil:
+    if mysql_rdb.real_connect(conn, host, user, password, database, port.int32, nil, 0) == nil:
       var errmsg = $mysql_rdb.error(conn)
       mysql_rdb.close(conn)
       dbError(errmsg)
diff --git a/src/allographer/v2/query_builder/models/postgres/postgres_open.nim b/src/allographer/v2/query_builder/models/postgres/postgres_open.nim
index f95e4302..9ca0ee5a 100644
--- a/src/allographer/v2/query_builder/models/postgres/postgres_open.nim
+++ b/src/allographer/v2/query_builder/models/postgres/postgres_open.nim
@@ -6,7 +6,7 @@ import ./postgres_types
 
 
 proc dbOpen*(_:type PostgreSQL, database: string = "", user: string = "", password: string = "",
-                    host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+                    host: string = "", port:int = 0, maxConnections: int = 1, timeout=30,
                     shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): PostgresConnections =
   var pools = newSeq[PostgresConnection](maxConnections)
   for i in 0..<maxConnections:
diff --git a/src/allographer/v2/query_builder/models/sqlite/sqlite_open.nim b/src/allographer/v2/query_builder/models/sqlite/sqlite_open.nim
index c3d2b1fb..33c1c2b6 100644
--- a/src/allographer/v2/query_builder/models/sqlite/sqlite_open.nim
+++ b/src/allographer/v2/query_builder/models/sqlite/sqlite_open.nim
@@ -4,8 +4,8 @@ import ../../log
 import ./sqlite_types
 
 
-proc dbOpen*(_:type SQLite3, database: string = "", user: string = "", password: string = "",
-              host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+proc dbOpen*(_:type SQLite3, database: string = "", 
+              maxConnections: int = 1, timeout=30,
               shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): SqliteConnections =
   var pools = newSeq[SqliteConnection](maxConnections)
   for i in 0..<maxConnections:
diff --git a/src/allographer/v2/query_builder/models/surreal/surreal_open.nim b/src/allographer/v2/query_builder/models/surreal/surreal_open.nim
index 21b1d83c..fff285c8 100644
--- a/src/allographer/v2/query_builder/models/surreal/surreal_open.nim
+++ b/src/allographer/v2/query_builder/models/surreal/surreal_open.nim
@@ -11,7 +11,7 @@ import ./surreal_types
 
 
 proc dbOpen*(_:type SurrealDB, namespace:string = "", database: string = "", user: string = "", password: string = "",
-              host: string = "", port: int32 = 0, maxConnections: int = 1, timeout=30,
+              host: string = "", port: int = 0, maxConnections: int = 1, timeout=30,
               shouldDisplayLog=false, shouldOutputLogFile=false, logDir=""): Future[SurrealConnections] {.async.} =
   var pools = newSeq[SurrealConnection](maxConnections)
   for i in 0..<maxConnections:
@@ -36,7 +36,7 @@ proc dbOpen*(_:type SurrealDB, namespace:string = "", database: string = "", use
     let conn = SurrealConn(
       client: client,
       host: host,
-      port: port
+      port: port.int32
     )
 
     pools[i] = SurrealConnection(
diff --git a/tests/test_query_paginate.nim b/tests/test_query_paginate.nim
index d6520acd..acf04bb8 100644
--- a/tests/test_query_paginate.nim
+++ b/tests/test_query_paginate.nim
@@ -22,7 +22,7 @@ for rdb in dbConnections:
       Column.string("name").nullable(),
       Column.string("email").nullable(),
       Column.string("address").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL)
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL)
     ])
   ])
 
diff --git a/tests/test_sql_injection.nim b/tests/test_sql_injection.nim
index b8d0cc3a..658a2978 100644
--- a/tests/test_sql_injection.nim
+++ b/tests/test_sql_injection.nim
@@ -25,7 +25,7 @@ proc setUp(rdb:Rdb) =
       Column.string("salt").nullable(),
       Column.string("address").nullable(),
       Column.date("birth_date").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL)
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL)
     ])
   )
 
diff --git a/tests/v1/mariadb/connection.nim b/tests/v1/mariadb/connection.nim
index 0c155cfd..092365c3 100644
--- a/tests/v1/mariadb/connection.nim
+++ b/tests/v1/mariadb/connection.nim
@@ -7,7 +7,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   mariadbHost = getEnv("MARIA_HOST")
-  mysqlPort = getEnv("MY_PORT").parseInt.int32
+  mysqlPort = getEnv("MY_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt
 
diff --git a/tests/v1/mariadb/test_query.nim b/tests/v1/mariadb/test_query.nim
index 209de6d1..e717c5d7 100644
--- a/tests/v1/mariadb/test_query.nim
+++ b/tests/v1/mariadb/test_query.nim
@@ -27,7 +27,7 @@ proc setup(rdb:MariadbConnections) =
       Column.string("address").nullable(),
       Column.date("submit_on").nullable(),
       Column.datetime("submit_at").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL).nullable()
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL).nullable()
     ])
   ])
 
diff --git a/tests/v1/mariadb/test_return_type.nim b/tests/v1/mariadb/test_return_type.nim
index fbb7e304..52e2b6e8 100644
--- a/tests/v1/mariadb/test_return_type.nim
+++ b/tests/v1/mariadb/test_return_type.nim
@@ -42,7 +42,7 @@ proc setUp(rdb:MariadbConnections) =
     table("user",[
       Column.increments("id"),
       Column.string("name"),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL),
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL),
       Column.boolean("bool"),
       Column.float("float"),
     ])
diff --git a/tests/v1/mariadb/test_schema.nim b/tests/v1/mariadb/test_schema.nim
index b46d7cb6..97140717 100644
--- a/tests/v1/mariadb/test_schema.nim
+++ b/tests/v1/mariadb/test_schema.nim
@@ -46,8 +46,8 @@ suite("MariaDB create table"):
         Column.boolean("boolean").index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A"),
         Column.json("json").index().default(%*{"key":"value"}),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ]),
       table("TypeUnique", [
         Column.increments("id"),
@@ -74,8 +74,8 @@ suite("MariaDB create table"):
         Column.boolean("boolean").unique().index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).unique().index().default("A"),
         Column.json("json").unique().index().default(%*{"key":"value"}),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ])
     )
 
@@ -178,8 +178,8 @@ suite($rdb & " alter table"):
         Column.boolean("boolean").index().default(true).add(),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A").add(),
         Column.json("json").index().default(%*{"key":"value"}).add(),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL).add(),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL).add()
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL).add(),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL).add()
       ]),
       table("TypeUnique", [
         Column.increments("id").add(),
@@ -286,7 +286,7 @@ suite($rdb & " primary"):
           Column.integer("index1"),
           Column.integer("index2"),
           Column.string("string"),
-          Column.foreign("relation_id").reference("id").on("relation").onDelete(SET_NULL)
+          Column.foreign("relation_id").reference("id").onTable("relation").onDelete(SET_NULL)
         ],
         primary = @["index1", "index2"]
       )
diff --git a/tests/v1/mariadb/test_transaction.nim b/tests/v1/mariadb/test_transaction.nim
index 4528891c..bcb671a1 100644
--- a/tests/v1/mariadb/test_transaction.nim
+++ b/tests/v1/mariadb/test_transaction.nim
@@ -24,7 +24,7 @@ proc setUp(rdb:MariadbConnections) =
       Column.string("name").nullable(),
       Column.string("email").nullable(),
       Column.string("address").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL)
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL)
     ])
   ])
 
diff --git a/tests/v1/mysql/connection.nim b/tests/v1/mysql/connection.nim
index 87cff646..a98e307a 100644
--- a/tests/v1/mysql/connection.nim
+++ b/tests/v1/mysql/connection.nim
@@ -7,7 +7,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   mysqlHost = getEnv("MY_HOST")
-  mysqlPort = getEnv("MY_PORT").parseInt.int32
+  mysqlPort = getEnv("MY_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt
 
diff --git a/tests/v1/mysql/test_query.nim b/tests/v1/mysql/test_query.nim
index 7b30d017..069c05b1 100644
--- a/tests/v1/mysql/test_query.nim
+++ b/tests/v1/mysql/test_query.nim
@@ -27,7 +27,7 @@ proc setup(rdb:MysqlConnections) =
       Column.string("address").nullable(),
       Column.date("submit_on").nullable(),
       Column.datetime("submit_at").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL).nullable()
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL).nullable()
     ])
   ])
 
diff --git a/tests/v1/mysql/test_return_type.nim b/tests/v1/mysql/test_return_type.nim
index c6b43b0f..7df4369f 100644
--- a/tests/v1/mysql/test_return_type.nim
+++ b/tests/v1/mysql/test_return_type.nim
@@ -42,7 +42,7 @@ proc setUp(rdb:MysqlConnections) =
     table("user",[
       Column.increments("id"),
       Column.string("name"),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL),
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL),
       Column.boolean("bool"),
       Column.float("float"),
     ])
diff --git a/tests/v1/mysql/test_schema.nim b/tests/v1/mysql/test_schema.nim
index f82cebc2..16cc495c 100644
--- a/tests/v1/mysql/test_schema.nim
+++ b/tests/v1/mysql/test_schema.nim
@@ -47,8 +47,8 @@ suite("MySQL create table"):
         Column.boolean("boolean").index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A"),
         Column.json("json"),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ]),
       # text, binary, json column can't use default value, index and unique
       table("TypeUnique", [
@@ -76,8 +76,8 @@ suite("MySQL create table"):
         Column.boolean("boolean").unique().index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).unique().index().default("A"),
         Column.json("json"),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ])
     )
 
@@ -487,8 +487,8 @@ suite("MySQL alter table"):
         Column.boolean("boolean").index().default(true).add(),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A").add(),
         Column.json("json").add(),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL).add(),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL).add()
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL).add(),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL).add()
       ]),
       table("TypeUnique", [
         Column.increments("id").add(),
@@ -595,7 +595,7 @@ suite($rdb & " primary"):
           Column.integer("index1"),
           Column.integer("index2"),
           Column.string("string"),
-          Column.foreign("relation_id").reference("id").on("relation").onDelete(SET_NULL)
+          Column.foreign("relation_id").reference("id").onTable("relation").onDelete(SET_NULL)
         ],
         primary = @["index1", "index2"]
       )
diff --git a/tests/v1/mysql/test_transaction.nim b/tests/v1/mysql/test_transaction.nim
index 2de728a6..6ce21cf8 100644
--- a/tests/v1/mysql/test_transaction.nim
+++ b/tests/v1/mysql/test_transaction.nim
@@ -24,7 +24,7 @@ proc setUp(rdb:MysqlConnections) =
       Column.string("name").nullable(),
       Column.string("email").nullable(),
       Column.string("address").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL)
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL)
     ])
   ])
 
diff --git a/tests/v1/postgres/connection.nim b/tests/v1/postgres/connection.nim
index 4ba4016d..eba26ce7 100644
--- a/tests/v1/postgres/connection.nim
+++ b/tests/v1/postgres/connection.nim
@@ -7,7 +7,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   pgHost = getEnv("PG_HOST")
-  pgPort = getEnv("PG_PORT").parseInt.int32
+  pgPort = getEnv("PG_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt
 
diff --git a/tests/v1/postgres/test_query.nim b/tests/v1/postgres/test_query.nim
index 9d1956da..d1fa977c 100644
--- a/tests/v1/postgres/test_query.nim
+++ b/tests/v1/postgres/test_query.nim
@@ -31,7 +31,7 @@ proc setup(rdb:PostgresConnections) =
       Column.string("address").nullable(),
       Column.date("submit_on").nullable(),
       Column.datetime("submit_at").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL).nullable()
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL).nullable()
     ])
   ])
 
diff --git a/tests/v1/postgres/test_return_type.nim b/tests/v1/postgres/test_return_type.nim
index 62663747..76b6f6f8 100644
--- a/tests/v1/postgres/test_return_type.nim
+++ b/tests/v1/postgres/test_return_type.nim
@@ -42,7 +42,7 @@ proc setUp(rdb:PostgresConnections) =
     table("user",[
       Column.increments("id"),
       Column.string("name"),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL),
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL),
       Column.boolean("bool"),
       Column.float("float"),
     ])
diff --git a/tests/v1/postgres/test_schema.nim b/tests/v1/postgres/test_schema.nim
index c3f28f06..6074cb84 100644
--- a/tests/v1/postgres/test_schema.nim
+++ b/tests/v1/postgres/test_schema.nim
@@ -46,8 +46,8 @@ suite("PostgreSQL create table"):
         Column.boolean("boolean").index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A"),
         Column.json("json").index().default(%*{"key":"value"}),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ]),
       table("TypeUnique", [
         Column.increments("id"),
@@ -74,8 +74,8 @@ suite("PostgreSQL create table"):
         Column.boolean("boolean").unique().index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).unique().index().default("A"),
         Column.json("json").unique().index().default(%*{"key":"value"}),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ])
     )
 
@@ -178,8 +178,8 @@ suite($rdb & " alter table"):
         Column.boolean("boolean").index().default(true).add(),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A").add(),
         Column.json("json").index().default(%*{"key":"value"}).add(),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL).add(),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL).add()
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL).add(),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL).add()
       ]),
       table("TypeUnique", [
         Column.increments("id").add(),
@@ -286,7 +286,7 @@ suite($rdb & " primary"):
           Column.integer("index1"),
           Column.integer("index2"),
           Column.string("string"),
-          Column.foreign("relation_id").reference("id").on("relation").onDelete(SET_NULL)
+          Column.foreign("relation_id").reference("id").onTable("relation").onDelete(SET_NULL)
         ],
         primary = @["index1", "index2"]
       )
diff --git a/tests/v1/postgres/test_transaction.nim b/tests/v1/postgres/test_transaction.nim
index e92437d7..18091af4 100644
--- a/tests/v1/postgres/test_transaction.nim
+++ b/tests/v1/postgres/test_transaction.nim
@@ -24,7 +24,7 @@ proc setUp(rdb:PostgresConnections) =
       Column.string("name").nullable(),
       Column.string("email").nullable(),
       Column.string("address").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL)
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL)
     ])
   ])
 
diff --git a/tests/v1/sqlite/test_query.nim b/tests/v1/sqlite/test_query.nim
index cc3e68cb..880b6452 100644
--- a/tests/v1/sqlite/test_query.nim
+++ b/tests/v1/sqlite/test_query.nim
@@ -31,7 +31,7 @@ proc setup(rdb:SqliteConnections) =
       Column.string("address").nullable(),
       Column.date("submit_on").nullable(),
       Column.datetime("submit_at").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL).nullable()
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL).nullable()
     ])
   ])
 
diff --git a/tests/v1/sqlite/test_return_type.nim b/tests/v1/sqlite/test_return_type.nim
index b063a714..7d12f5e1 100644
--- a/tests/v1/sqlite/test_return_type.nim
+++ b/tests/v1/sqlite/test_return_type.nim
@@ -42,7 +42,7 @@ proc setUp(rdb:SqliteConnections) =
     table("user",[
       Column.increments("id"),
       Column.string("name"),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL),
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL),
       Column.boolean("bool"),
       Column.float("float"),
     ])
diff --git a/tests/v1/sqlite/test_schema.nim b/tests/v1/sqlite/test_schema.nim
index b2a394d2..52196086 100644
--- a/tests/v1/sqlite/test_schema.nim
+++ b/tests/v1/sqlite/test_schema.nim
@@ -46,8 +46,8 @@ suite("Sqlite create table"):
         Column.boolean("boolean").index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A"),
         Column.json("json").index().default(%*{"key":"value"}),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ]),
       table("TypeUnique", [
         Column.increments("id"),
@@ -74,8 +74,8 @@ suite("Sqlite create table"):
         Column.boolean("boolean").unique().index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).unique().index().default("A"),
         Column.json("json").unique().index().default(%*{"key":"value"}),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL)
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL)
       ])
     )
 
@@ -178,8 +178,8 @@ suite($rdb & " alter table"):
         Column.boolean("boolean").index().default(true).add(),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A").add(),
         Column.json("json").index().default(%*{"key":"value"}).add(),
-        Column.foreign("int_relation_id").reference("id").on("IntRelation").onDelete(SET_NULL).add(),
-        Column.strForeign("str_relation_id").reference("uuid").on("StrRelation").onDelete(SET_NULL).add()
+        Column.foreign("int_relation_id").reference("id").onTable("IntRelation").onDelete(SET_NULL).add(),
+        Column.strForeign("str_relation_id").reference("uuid").onTable("StrRelation").onDelete(SET_NULL).add()
       ]),
       table("TypeUnique", [
         Column.increments("id").add(),
@@ -286,7 +286,7 @@ suite($rdb & " primary"):
           Column.integer("index1"),
           Column.integer("index2"),
           Column.string("string"),
-          Column.foreign("relation_id").reference("id").on("relation").onDelete(SET_NULL)
+          Column.foreign("relation_id").reference("id").onTable("relation").onDelete(SET_NULL)
         ],
         primary = @["index1", "index2"]
       )
diff --git a/tests/v1/sqlite/test_transaction.nim b/tests/v1/sqlite/test_transaction.nim
index f7c5e470..2f58c8e5 100644
--- a/tests/v1/sqlite/test_transaction.nim
+++ b/tests/v1/sqlite/test_transaction.nim
@@ -24,7 +24,7 @@ proc setUp(rdb:SqliteConnections) =
       Column.string("name").nullable(),
       Column.string("email").nullable(),
       Column.string("address").nullable(),
-      Column.foreign("auth_id").reference("id").on("auth").onDelete(SET_NULL)
+      Column.foreign("auth_id").reference("id").onTable("auth").onDelete(SET_NULL)
     ])
   ])
 
diff --git a/tests/v1/surrealdb/connection.nim b/tests/v1/surrealdb/connection.nim
index b95d3219..8cae9f89 100644
--- a/tests/v1/surrealdb/connection.nim
+++ b/tests/v1/surrealdb/connection.nim
@@ -8,7 +8,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   surrealHost = getEnv("SURREAL_HOST")
-  surrealPort = getEnv("SURREAL_PORT").parseInt.int32
+  surrealPort = getEnv("SURREAL_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt
 
diff --git a/tests/v1/surrealdb/test_query.nim b/tests/v1/surrealdb/test_query.nim
index 312e113b..b8580708 100644
--- a/tests/v1/surrealdb/test_query.nim
+++ b/tests/v1/surrealdb/test_query.nim
@@ -33,7 +33,7 @@ proc setup(rdb:SurrealConnections) =
       Column.string("address").nullable(),
       Column.date("submit_on"),
       Column.datetime("submit_at"),
-      Column.foreign("auth").reference("id").on("auth").onDelete(SET_NULL).nullable()
+      Column.foreign("auth").reference("id").onTable("auth").onDelete(SET_NULL).nullable()
     ])
   ])
 
diff --git a/tests/v1/surrealdb/test_schema.nim b/tests/v1/surrealdb/test_schema.nim
index ff500aeb..622210f9 100644
--- a/tests/v1/surrealdb/test_schema.nim
+++ b/tests/v1/surrealdb/test_schema.nim
@@ -43,7 +43,7 @@ suite("SurrealDB create table"):
         Column.boolean("boolean").index().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A"),
         Column.json("json").index().default(%*{"key":"value"}),
-        Column.foreign("relation").reference("id").on("relation").onDelete(SET_NULL).nullable(),
+        Column.foreign("relation").reference("id").onTable("relation").onDelete(SET_NULL).nullable(),
       ]),
       table("TypeUnique", [
         Column.increments("index"),
@@ -70,7 +70,7 @@ suite("SurrealDB create table"):
         Column.boolean("boolean").index().unique().unique().default(true),
         Column.enumField("enumField", ["A", "B", "C"]).index().unique().default("A"),
         Column.json("json").index().unique().default(%*{"key":"value"}),
-        Column.foreign("relation").reference("id").on("relation").onDelete(SET_NULL).nullable(),
+        Column.foreign("relation").reference("id").onTable("relation").onDelete(SET_NULL).nullable(),
       ]),
     )
 
@@ -313,7 +313,7 @@ suite("SurrealDB alter table"):
         Column.boolean("boolean").index().default(true).add(),
         Column.enumField("enumField", ["A", "B", "C"]).index().default("A").add(),
         Column.json("json").index().default(%*{"key":"value"}).add(),
-        Column.foreign("relation").reference("id").on("relation").onDelete(SET_NULL).nullable().add(),
+        Column.foreign("relation").reference("id").onTable("relation").onDelete(SET_NULL).nullable().add(),
       ]),
       table("TypeUnique", [
         Column.increments("index").add(),
@@ -340,7 +340,7 @@ suite("SurrealDB alter table"):
         Column.boolean("boolean").index().unique().unique().default(true).add(),
         Column.enumField("enumField", ["A", "B", "C"]).index().unique().default("A").add(),
         Column.json("json").index().unique().default(%*{"key":"value"}).add(),
-        Column.foreign("relation").reference("id").on("relation").onDelete(SET_NULL).nullable().add(),
+        Column.foreign("relation").reference("id").onTable("relation").onDelete(SET_NULL).nullable().add(),
       ]),
     )
 
diff --git a/tests/v2/mariadb/connection.nim b/tests/v2/mariadb/connection.nim
index 0c155cfd..092365c3 100644
--- a/tests/v2/mariadb/connection.nim
+++ b/tests/v2/mariadb/connection.nim
@@ -7,7 +7,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   mariadbHost = getEnv("MARIA_HOST")
-  mysqlPort = getEnv("MY_PORT").parseInt.int32
+  mysqlPort = getEnv("MY_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt
 
diff --git a/tests/v2/mysql/connection.nim b/tests/v2/mysql/connection.nim
index 87cff646..a98e307a 100644
--- a/tests/v2/mysql/connection.nim
+++ b/tests/v2/mysql/connection.nim
@@ -7,7 +7,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   mysqlHost = getEnv("MY_HOST")
-  mysqlPort = getEnv("MY_PORT").parseInt.int32
+  mysqlPort = getEnv("MY_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt
 
diff --git a/tests/v2/postgres/connection.nim b/tests/v2/postgres/connection.nim
index 4ba4016d..eba26ce7 100644
--- a/tests/v2/postgres/connection.nim
+++ b/tests/v2/postgres/connection.nim
@@ -7,7 +7,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   pgHost = getEnv("PG_HOST")
-  pgPort = getEnv("PG_PORT").parseInt.int32
+  pgPort = getEnv("PG_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt
 
diff --git a/tests/v2/surrealdb/connection.nim b/tests/v2/surrealdb/connection.nim
index b95d3219..8cae9f89 100644
--- a/tests/v2/surrealdb/connection.nim
+++ b/tests/v2/surrealdb/connection.nim
@@ -8,7 +8,7 @@ let
   user = getEnv("DB_USER")
   password = getEnv("DB_PASSWORD")
   surrealHost = getEnv("SURREAL_HOST")
-  surrealPort = getEnv("SURREAL_PORT").parseInt.int32
+  surrealPort = getEnv("SURREAL_PORT").parseInt
   maxConnections = getEnv("DB_MAX_CONNECTION").parseInt
   timeout = getEnv("DB_TIMEOUT").parseInt