mysql2-core 0.3.10 → 0.5.1

package/lib/index.js

@@ -59,35 +59,54 @@ export function metadata(attrs) {
   }
   return m;
 }
-export function buildToSave(obj, table, attrs, buildParam, i) {
-  if (!i) {
-    i = 1;
-  }
+export function buildToSave(obj, table, attrs, pks, ver, buildParam) {
   if (!buildParam) {
     buildParam = param;
   }
   const ks = Object.keys(attrs);
-  const pks = [];
+  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 = [];
   const values = [];
   const args = [];
-  let isVersion = false;
   const o = 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) {
       const field = attr.column ? attr.column : k;
       cols.push(field);
-      if (attr.version) {
+      if (k === ver) {
         isVersion = true;
+        ver = k;
         values.push(`${1}`);
       }
       else {
@@ -102,11 +121,11 @@ export function buildToSave(obj, table, attrs, buildParam, i) {
           values.push(p);
           if (typeof v === "boolean") {
             if (v === true) {
-              const v2 = attr.true !== undefined ? attr.true : `'1'`;
+              const v2 = attr.true !== undefined ? attr.true : `1`;
               args.push(v2);
             }
             else {
-              const v2 = attr.false !== undefined ? attr.false : `'0'`;
+              const v2 = attr.false !== undefined ? attr.false : `0`;
               args.push(v2);
             }
           }
@@ -117,17 +136,32 @@ export function buildToSave(obj, table, attrs, buildParam, i) {
       }
     }
   }
-  if (pks.length === 0) {
+  if (cols.length > 0 && ver && isVersion === false) {
+    const attr = attrs[ver];
+    if (attr) {
+      const field = attr.column ? attr.column : ver;
+      cols.push(field);
+      values.push("1");
+    }
+  }
+  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 = [];
+    let version = null;
     for (const k of ks) {
       const v = o[k];
       if (v !== undefined) {
@@ -135,110 +169,60 @@ export function buildToSave(obj, table, attrs, buildParam, i) {
         if (attr && !attr.key && !attr.ignored && !attr.noupdate) {
           const field = attr.column ? attr.column : k;
           let x;
-          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 !== undefined ? 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 !== undefined ? 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(objs, table, attrs, buildParam) {
-  if (!buildParam) {
-    buildParam = param;
-  }
-  const sts = [];
-  const ks = Object.keys(attrs);
-  for (const obj of objs) {
-    let i = 1;
-    const cols = [];
-    const values = [];
-    const args = [];
-    let isVersion = false;
-    const o = obj;
-    for (const k of ks) {
-      const attr = attrs[k];
-      let v = o[k];
-      if (v == null) {
-        v = attr.default;
+    if (cols.length > 0) {
+      if (colSet.length === 0) {
+        const q = `insert ignore into ${table}(${cols.join(",")})values(${values.join(",")})`;
+        return { query: q, params: args };
       }
-      if (v != null && !attr.ignored && !attr.noinsert) {
-        const field = attr.column ? attr.column : k;
-        cols.push(field);
-        if (attr.version) {
-          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 !== undefined ? attr.true : `'1'`;
-                args.push(v2);
-              }
-              else {
-                const v2 = attr.false !== undefined ? attr.false : `'0'`;
-                args.push(v2);
-              }
-            }
-            else {
-              args.push(v);
-            }
-          }
-        }
+      else {
+        const q = `insert into ${table}(${cols.join(",")})values(${values.join(",")}) on duplicate key update ${colSet.join(",")}`;
+        return { query: q, params: args };
       }
     }
-    const colSet = [];
-    for (const k of ks) {
-      const v = o[k];
-      if (v !== undefined) {
-        const attr = attrs[k];
-        if (attr && !attr.key && !attr.ignored && !attr.noupdate) {
-          const field = attr.column ? attr.column : k;
+    else {
+      if (colSet.length === 0) {
+        return { query: "", params: args };
+      }
+      else {
+        const colQuery = [];
+        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;
-          if (v === null) {
-            x = "null";
-          }
-          else if (v === "") {
+          if (v === "") {
             x = `''`;
           }
           else if (typeof v === "number") {
@@ -248,11 +232,11 @@ export function buildToSaveBatch(objs, table, attrs, buildParam) {
             x = buildParam(i++);
             if (typeof v === "boolean") {
               if (v === true) {
-                const v2 = attr.true !== undefined ? attr.true : `'1'`;
+                const v2 = attr.true !== undefined ? "" + attr.true : `1`;
                 args.push(v2);
               }
               else {
-                const v2 = attr.false !== undefined ? attr.false : `'0'`;
+                const v2 = attr.false !== undefined ? "" + attr.false : `0`;
                 args.push(v2);
               }
             }
@@ -260,18 +244,46 @@ export function buildToSaveBatch(objs, table, attrs, buildParam) {
               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 = { query: q, params: args };
-      sts.push(smt);
+  }
+}
+export function buildToSaveBatch(objs, table, attrs, pks, ver, buildParam) {
+  if (!buildParam) {
+    buildParam = param;
+  }
+  const sts = [];
+  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;
+      }
     }
-    else {
-      const q = `insert into ${table}(${cols.join(",")})values(${values.join(",")}) on duplicate key update ${colSet.join(",")};`;
-      const smt = { query: q, params: args };
+  }
+  for (const obj of objs) {
+    const smt = buildToSave(obj, table, attrs, pks, ver, buildParam);
+    if (smt.query) {
       sts.push(smt);
     }
   }
@@ -301,32 +313,24 @@ export function getConnection(pool) {
     });
   });
 }
-export function beginTransaction(connection, rollbackIfError) {
+export function beginTransaction(connection) {
   return new Promise((resolve, reject) => {
-    connection.beginTransaction((err) => {
-      if (err) {
-        if (!rollbackIfError) {
-          return reject(err);
-        }
-        return connection.rollback(() => {
-          return reject(err);
-        });
+    connection.beginTransaction((beginError) => {
+      if (beginError) {
+        connection.release();
+        return reject(beginError);
       }
       return resolve();
     });
   });
 }
-export function commit(connection, rollbackIfError) {
+export function commit(connection) {
   return new Promise((resolve, reject) => {
     connection.commit((err) => {
       if (err) {
-        if (!rollbackIfError) {
-          return reject(err);
-        }
-        return connection.rollback(() => {
-          return reject(err);
-        });
+        return reject(err);
       }
+      connection.release();
       return resolve();
     });
   });
@@ -334,6 +338,7 @@ export function commit(connection, rollbackIfError) {
 export function rollback(connection) {
   return new Promise((resolve, reject) => {
     connection.rollback((err) => {
+      connection.release();
       if (err) {
         return reject(err);
       }
@@ -364,10 +369,8 @@ export class PoolManager {
         }
         connection.beginTransaction((beginError) => {
           if (beginError) {
-            return connection.rollback(() => {
-              connection.release();
-              return reject(beginError);
-            });
+            connection.release();
+            return reject(beginError);
           }
           return resolve(new PoolConnectionManager(connection));
         });
@@ -377,8 +380,8 @@ export class PoolManager {
   execute(sql, args) {
     return execute(this.pool, sql, args);
   }
-  executeBatch(statements, firstAffected) {
-    return executeBatch(this.pool, statements, firstAffected);
+  executeBatch(statements, requireFirstAffected) {
+    return executeBatch(this.pool, statements, requireFirstAffected);
   }
   query(sql, args, m, bools) {
     return query(this.pool, sql, args, m, bools);
@@ -405,6 +408,7 @@ export class PoolConnectionManager {
     this.queryOne = this.queryOne.bind(this);
     this.executeScalar = this.executeScalar.bind(this);
     this.count = this.count.bind(this);
+    this.release = this.release.bind(this);
   }
   param(i) {
     return "?";
@@ -413,10 +417,7 @@ export class PoolConnectionManager {
     return new Promise((resolve, reject) => {
       this.connection.commit((err) => {
         if (err) {
-          return this.connection.rollback(() => {
-            this.release();
-            return reject(err);
-          });
+          return reject(err);
         }
         this.release();
         return resolve();
@@ -444,10 +445,10 @@ export class PoolConnectionManager {
   execute(sql, args) {
     return execute(this.connection, sql, args);
   }
-  executeBatch(statements, firstAffected) {
-    return executeBatchConnection(this.connection, statements, firstAffected);
+  executeBatch(statements, requireFirstAffected) {
+    return executeBatchConnection(this.connection, statements, requireFirstAffected);
   }
-  query(sql, args, m, bools, ctx) {
+  query(sql, args, m, bools) {
     return query(this.connection, sql, args, m, bools);
   }
   queryOne(sql, args, m, bools) {
@@ -460,7 +461,7 @@ export class PoolConnectionManager {
     return count(this.connection, sql, args);
   }
 }
-export function executeBatch(pool, statements, firstAffected) {
+export function executeBatch(pool, statements, requireFirstAffected) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!statements || statements.length === 0) {
       return 0;
@@ -469,31 +470,28 @@ export function executeBatch(pool, statements, firstAffected) {
       return execute(pool, statements[0].query, statements[0].params);
     }
     const connection = yield getConnection(pool);
-    try {
-      return yield executeBatchConnectionTx(connection, statements, firstAffected);
-    }
-    finally {
-      connection.release();
-    }
+    return yield executeBatchConnectionTx(connection, statements, requireFirstAffected);
   });
 }
-export function executeBatchConnectionTx(connection, statements, firstAffected) {
+export function executeBatchConnectionTx(connection, statements, requireFirstAffected) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!statements || statements.length === 0) {
       return 0;
     }
     if (statements.length === 1) {
-      return execute(connection, statements[0].query, statements[0].params);
+      const count = yield execute(connection, statements[0].query, statements[0].params);
+      connection.release();
+      return count;
     }
-    yield beginTransaction(connection, true);
+    yield beginTransaction(connection);
     try {
       let count = 0;
       if (resource.multipleStatements) {
-        if (firstAffected) {
+        if (requireFirstAffected) {
           const firstCount = yield execute(connection, statements[0].query, statements[0].params);
           count = firstCount;
           if (firstCount === 0) {
-            yield commit(connection, true);
+            yield commit(connection);
             return 0;
           }
           const remaining = statements.slice(1);
@@ -504,12 +502,12 @@ export function executeBatchConnectionTx(connection, statements, firstAffected)
         }
       }
       else {
-        const start = firstAffected ? 1 : 0;
-        if (firstAffected) {
+        const start = requireFirstAffected ? 1 : 0;
+        if (requireFirstAffected) {
           const firstCount = yield execute(connection, statements[0].query, statements[0].params);
           count = firstCount;
           if (firstCount === 0) {
-            yield commit(connection, true);
+            yield commit(connection);
             return 0;
           }
         }
@@ -518,7 +516,7 @@ export function executeBatchConnectionTx(connection, statements, firstAffected)
           count += yield execute(connection, item.query, item.params);
         }
       }
-      yield commit(connection, true);
+      yield commit(connection);
       return count;
     }
     catch (err) {
@@ -527,11 +525,12 @@ export function executeBatchConnectionTx(connection, statements, firstAffected)
       }
       catch (_a) {
       }
-      throw buildError(err);
+      buildError(err);
+      throw err;
     }
   });
 }
-export function executeBatchConnection(connection, statements, firstAffected) {
+export function executeBatchConnection(connection, statements, requireFirstAffected) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!statements || statements.length === 0) {
       return 0;
@@ -540,7 +539,7 @@ export function executeBatchConnection(connection, statements, firstAffected) {
       return execute(connection, statements[0].query, statements[0].params);
     }
     if (resource.multipleStatements) {
-      if (firstAffected) {
+      if (requireFirstAffected) {
         const firstCount = yield execute(connection, statements[0].query, statements[0].params);
         if (firstCount === 0) {
           return 0;
@@ -550,8 +549,8 @@ export function executeBatchConnection(connection, statements, firstAffected) {
       return executeMultipleStatements(connection, statements);
     }
     let count = 0;
-    const start = firstAffected ? 1 : 0;
-    if (firstAffected) {
+    const start = requireFirstAffected ? 1 : 0;
+    if (requireFirstAffected) {
       const firstCount = yield execute(connection, statements[0].query, statements[0].params);
       count = firstCount;
       if (firstCount === 0) {
@@ -669,27 +668,6 @@ export function executeScalar(pool, sql, args) {
 export function count(pool, sql, args) {
   return executeScalar(pool, sql, args).then((res) => (res !== null ? res : 0));
 }
-export function save(pool, obj, table, attrs, buildParam) {
-  const s = buildToSave(obj, table, attrs, buildParam);
-  if (!s.query) {
-    return Promise.resolve(-1);
-  }
-  if (typeof pool === "function") {
-    return pool(s.query, s.params);
-  }
-  else {
-    return execute(pool, s.query, s.params);
-  }
-}
-export function saveBatch(pool, objs, table, attrs, buildParam) {
-  const s = buildToSaveBatch(objs, table, attrs, buildParam);
-  if (typeof pool === "function") {
-    return pool(s);
-  }
-  else {
-    return executeBatch(pool, s);
-  }
-}
 export function toArray(arr) {
   if (!arr || arr.length === 0) {
     return [];
@@ -881,6 +859,8 @@ export class StringAdapter {
     return execute(this.pool, s, values);
   }
 }
+export const StringRepository = StringAdapter;
+export const StringService = StringAdapter;
 export class MySQLWriter {
   constructor(pool, table, attributes, oneIfSuccess, map, buildParam) {
     this.pool = pool;
@@ -890,6 +870,9 @@ export class MySQLWriter {
     this.map = map;
     this.write = this.write.bind(this);
     this.param = buildParam ? buildParam : param;
+    const m = metadata(attributes);
+    this.keys = m.keys;
+    this.version = m.version;
   }
   write(obj) {
     if (!obj) {
@@ -899,7 +882,7 @@ export class MySQLWriter {
     if (this.map) {
       obj2 = this.map(obj);
     }
-    const stmt = buildToSave(obj2, this.table, this.attributes, this.param);
+    const stmt = buildToSave(obj2, this.table, this.attributes, this.keys, this.version, this.param);
     if (stmt.query) {
       if (this.oneIfSuccess) {
         return execute(this.pool, stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0));
@@ -913,7 +896,7 @@ export class MySQLWriter {
     }
   }
 }
-export class MySQLStreamWriter {
+export class BufferedBatchWriter {
   constructor(pool, table, attributes, size = 1000, map, buildParam) {
     this.pool = pool;
     this.table = table;
@@ -924,6 +907,9 @@ export class MySQLStreamWriter {
     this.write = this.write.bind(this);
     this.flush = this.flush.bind(this);
     this.param = buildParam ? buildParam : param;
+    const m = metadata(attributes);
+    this.keys = m.keys;
+    this.version = m.version;
   }
   write(obj) {
     if (!obj) {
@@ -949,11 +935,11 @@ export class MySQLStreamWriter {
       return Promise.resolve(0);
     }
     else {
-      const stmt = buildToSaveBatch(this.list, this.table, this.attributes, this.param);
+      const stmt = buildToSaveBatch(this.list, this.table, this.attributes, this.keys, this.version, this.param);
       if (stmt.length > 0) {
         return executeBatch(this.pool, stmt).then((r) => {
           this.list = [];
-          return stmt.length;
+          return r;
         });
       }
       else {
@@ -963,15 +949,17 @@ export class MySQLStreamWriter {
     }
   }
 }
-export class MySQLBatchWriter {
-  constructor(pool, table, attributes, oneIfSuccess, map, buildParam) {
+export class BatchWriter {
+  constructor(pool, table, attributes, map, buildParam) {
     this.pool = pool;
     this.table = table;
     this.attributes = attributes;
-    this.oneIfSuccess = oneIfSuccess;
     this.map = map;
     this.write = this.write.bind(this);
     this.param = buildParam ? buildParam : param;
+    const m = metadata(attributes);
+    this.keys = m.keys;
+    this.version = m.version;
   }
   write(objs) {
     if (!objs || objs.length === 0) {
@@ -985,14 +973,9 @@ export class MySQLBatchWriter {
         list.push(obj2);
       }
     }
-    const stmts = buildToSaveBatch(list, this.table, this.attributes, this.param);
+    const stmts = buildToSaveBatch(list, this.table, this.attributes, this.keys, this.version, this.param);
     if (stmts.length > 0) {
-      if (this.oneIfSuccess) {
-        return executeBatch(this.pool, stmts).then((ct) => stmts.length);
-      }
-      else {
-        return executeBatch(this.pool, stmts);
-      }
+      return executeBatch(this.pool, stmts);
     }
     else {
       return Promise.resolve(0);

package/package.json

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