mysql2-core 0.3.9 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2-core",
-  "version": "0.3.9",
+  "version": "0.5.1",
   "description": "mysql2-core",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/build.ts

@@ -59,28 +59,47 @@ export function metadata(attrs: Attributes): Metadata {
   }
   return m
 }
-export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: string, buildParam?: (i: number) => string, i?: number): Statement {
-  if (!i) {
-    i = 1
-  }
+export function buildToSave<T>(obj: T, table: string, attrs: Attributes, pks?: Attribute[], ver?: string, buildParam?: (i: number) => string): Statement {
   if (!buildParam) {
     buildParam = param
   }
   const ks = Object.keys(attrs)
-  const pks: Attribute[] = []
+  if (!pks) {
+    pks = []
+    for (const k of ks) {
+      const attr = attrs[k]
+      attr.name = k
+      if (attr.key) {
+        pks.push(attr)
+      }
+      if (attr.version) {
+        ver = k
+      }
+    }
+  }
+
   const cols: string[] = []
   const values: string[] = []
   const args: any[] = []
-  let isVersion = false
   const o: any = obj
+  let isUpdate = true
+  let isVersion = false
+  for (const k of pks) {
+    if (k.name) {
+      let v = o[k.name]
+      if (v == null) {
+        isUpdate = false
+      }
+    }
+  }
+  let i = 1
   for (const k of ks) {
     const attr = attrs[k]
-    attr.name = k
-    if (attr.key) {
-      pks.push(attr)
+    if (!attr) {
+      continue
     }
     let v = o[k]
-    if (v == null) {
+    if (v == null && attr.default !== undefined) {
       v = attr.default
     }
     if (v != null && !attr.ignored && !attr.noinsert) {
@@ -88,6 +107,7 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
       cols.push(field)
       if (k === ver) {
         isVersion = true
+        ver = k
         values.push(`${1}`)
       } else {
         if (v === "") {
@@ -99,10 +119,10 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
           values.push(p)
           if (typeof v === "boolean") {
             if (v === true) {
-              const v2 = attr.true ? attr.true : `'1'`
+              const v2 = attr.true !== undefined ? attr.true : `1`
               args.push(v2)
             } else {
-              const v2 = attr.false && attr.false !== 0 ? attr.false : `'0'`
+              const v2 = attr.false !== undefined ? attr.false : `0`
               args.push(v2)
             }
           } else {
@@ -112,21 +132,29 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
       }
     }
   }
-  if (!isVersion && ver && ver.length > 0) {
+  if (cols.length > 0 && ver && isVersion === false) {
     const attr = attrs[ver]
-    const field = attr.column ? attr.column : ver
-    cols.push(field)
-    values.push(`${1}`)
+    if (attr) {
+      const field = attr.column ? attr.column : ver
+      cols.push(field)
+      values.push("1")
+    }
   }
-  if (pks.length === 0) {
+  if (isUpdate === false || pks.length === 0) {
     if (cols.length === 0) {
       return { query: "", params: args }
     } else {
-      const q = `insert into ${table}(${cols.join(",")})values(${values.join(",")})`
-      return { query: q, params: args }
+      if (pks.length === 0) {
+        const q = `insert into ${table}(${cols.join(",")})values(${values.join(",")})`
+        return { query: q, params: args }
+      } else {
+        const q = `insert ignore into ${table}(${cols.join(",")})values(${values.join(",")})`
+        return { query: q, params: args }
+      }
     }
   } else {
     const colSet: string[] = []
+    let version: string | null = null
     for (const k of ks) {
       const v = o[k]
       if (v !== undefined) {
@@ -134,104 +162,52 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
         if (attr && !attr.key && !attr.ignored && !attr.noupdate) {
           const field = attr.column ? attr.column : k
           let x: string
-          if (v === null) {
-            x = "null"
-          } else if (v === "") {
-            x = `''`
-          } else if (typeof v === "number") {
-            x = toString(v)
+          if (attr.version) {
+            version = k
+            x = `${field} + 1`
           } else {
-            x = buildParam(i++)
-            if (typeof v === "boolean") {
-              if (v === true) {
-                const v2 = attr.true ? attr.true : `'1'`
-                args.push(v2)
+            if (v === "") {
+              x = `''`
+            } else if (typeof v === "number") {
+              x = toString(v)
+            } else {
+              x = buildParam(i++)
+              if (typeof v === "boolean") {
+                if (v === true) {
+                  const v2 = attr.true !== undefined ? attr.true : `1`
+                  args.push(v2)
+                } else {
+                  const v2 = attr.false !== undefined ? attr.false : `0`
+                  args.push(v2)
+                }
               } else {
-                const v2 = attr.false && attr.false !== 0 ? attr.false : `'0'`
-                args.push(v2)
+                args.push(v)
               }
-            } else {
-              args.push(v)
             }
           }
           colSet.push(`${field}=${x}`)
         }
       }
     }
-    if (colSet.length === 0) {
-      const q = `insert ignore into ${table}(${cols.join(",")})values(${values.join(",")})`
-      return { query: q, params: args }
-    } else {
-      const q = `insert into ${table}(${cols.join(",")})values(${values.join(",")}) on duplicate key update ${colSet.join(",")}`
-      return { query: q, params: args }
-    }
-  }
-}
-export function buildToSaveBatch<T>(objs: T[], table: string, attrs: Attributes, ver?: string, buildParam?: (i: number) => string): Statement[] {
-  if (!buildParam) {
-    buildParam = param
-  }
-  const sts: Statement[] = []
-  const ks = Object.keys(attrs)
-  for (const obj of objs) {
-    let i = 1
-    const cols: string[] = []
-    const values: string[] = []
-    const args: any[] = []
-    let isVersion = false
-    const o: any = obj
-    for (const k of ks) {
-      const attr = attrs[k]
-      let v = o[k]
-      if (v == null) {
-        v = attr.default
-      }
-      if (v != null && !attr.ignored && !attr.noinsert) {
-        const field = attr.column ? attr.column : k
-        cols.push(field)
-        if (k === ver) {
-          isVersion = true
-          values.push(`${1}`)
-        } else {
-          if (v === "") {
-            values.push(`''`)
-          } else if (typeof v === "number") {
-            values.push(toString(v))
-          } else {
-            const p = buildParam(i++)
-            values.push(p)
-            if (typeof v === "boolean") {
-              if (v === true) {
-                const v2 = attr.true ? attr.true : `'1'`
-                args.push(v2)
-              } else {
-                const v2 = attr.false && attr.false !== 0 ? attr.false : `'0'`
-                args.push(v2)
-              }
-            } else {
-              args.push(v)
-            }
-          }
-        }
+    if (cols.length > 0) {
+      if (colSet.length === 0) {
+        const q = `insert ignore into ${table}(${cols.join(",")})values(${values.join(",")})`
+        return { query: q, params: args }
+      } else {
+        const q = `insert into ${table}(${cols.join(",")})values(${values.join(",")}) on duplicate key update ${colSet.join(",")}`
+        return { query: q, params: args }
       }
-    }
-    if (!isVersion && ver && ver.length > 0) {
-      const attr = attrs[ver]
-      const field = attr.column ? attr.column : ver
-      cols.push(field)
-      values.push(`${1}`)
-    }
-    const colSet: string[] = []
-    for (const k of ks) {
-      const v = o[k]
-      if (v !== undefined) {
-        const attr = attrs[k]
-        if (attr && !attr.key && !attr.ignored && k !== ver && !attr.noupdate) {
-          const field = attr.column ? attr.column : k
+    } else {
+      if (colSet.length === 0) {
+        return { query: "", params: args }
+      } else {
+        const colQuery: string[] = []
+        for (const attr of pks) {
+          const field = attr.column ? attr.column : attr.name
+          const na = attr.name ? attr.name : ""
+          const v = o[na]
           let x: string
-          if (v === null) {
-            x = "null"
-          } else if (v === "") {
+          if (v === "") {
             x = `''`
           } else if (typeof v === "number") {
             x = toString(v)
@@ -239,27 +215,64 @@ export function buildToSaveBatch<T>(objs: T[], table: string, attrs: Attributes,
             x = buildParam(i++)
             if (typeof v === "boolean") {
               if (v === true) {
-                const v2 = attr.true ? attr.true : `'1'`
+                const v2 = attr.true !== undefined ? "" + attr.true : `1`
                 args.push(v2)
               } else {
-                const v2 = attr.false && attr.false !== 0 ? attr.false : `'0'`
+                const v2 = attr.false !== undefined ? "" + attr.false : `0`
                 args.push(v2)
               }
             } else {
               args.push(v)
             }
           }
-          colSet.push(`${field}=${x}`)
+          colQuery.push(`${field}=${x}`)
+        }
+        if (version && version.length > 0) {
+          const v = o[version]
+          if (typeof v === "number" && !isNaN(v)) {
+            const attr = attrs[version]
+            if (attr) {
+              const field = attr.column ? attr.column : version
+              colQuery.push(`${field}=${v}`)
+            }
+          }
         }
+        const q = `update ${table} set ${colSet.join(",")} where ${colQuery.join(" and ")}`
+        return { query: q, params: args }
       }
     }
-    if (colSet.length === 0) {
-      const q = `insert ignore into ${table}(${cols.join(",")})values(${values.join(",")});`
-      const smt: Statement = { query: q, params: args }
-      sts.push(smt)
-    } else {
-      const q = `insert into ${table}(${cols.join(",")})values(${values.join(",")}) on duplicate key update ${colSet.join(",")};`
-      const smt: Statement = { query: q, params: args }
+  }
+}
+export function buildToSaveBatch<T>(
+  objs: T[],
+  table: string,
+  attrs: Attributes,
+  pks?: Attribute[],
+  ver?: string,
+  buildParam?: (i: number) => string,
+): Statement[] {
+  if (!buildParam) {
+    buildParam = param
+  }
+  const sts: Statement[] = []
+  if (!pks) {
+    pks = []
+    const ks = Object.keys(attrs)
+    for (const k of ks) {
+      const attr = attrs[k]
+      attr.name = k
+      if (attr.key) {
+        pks.push(attr)
+      }
+      if (attr.version) {
+        ver = k
+      }
+    }
+  }
+
+  for (const obj of objs) {
+    const smt = buildToSave(obj, table, attrs, pks, ver, buildParam)
+    if (smt.query) {
       sts.push(smt)
     }
   }