mysql2-core 0.3.9 → 0.3.10

package/README.md

@@ -54,7 +54,7 @@ interface Executor {
   driver: string
   param(i: number): string
   execute(sql: string, args?: any[], ctx?: any): Promise<number>
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
+  executeBatch(statements: Statement[], firstAffected?: boolean, ctx?: any): Promise<number>
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
   queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T | null>
   executeScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T | null>
@@ -283,15 +283,15 @@ For multiple statements, the pool-level `executeBatch()` obtains a connection an
 
 The connection is released after completion.
 
-## `firstSuccess`
+## `firstAffected`
 
-`executeBatch()` supports an optional `firstSuccess` flag:
+`executeBatch()` supports an optional `firstAffected` flag:
 
 ```ts
 await db.executeBatch(statements, true)
 ```
 
-When `firstSuccess` is `true`, the first statement determines whether the remaining statements are executed.
+When `firstAffected` is `true`, the first statement determines whether the remaining statements are executed.
 
 If the first statement affects at least one row:
 

package/lib/index.js

@@ -59,7 +59,7 @@ export function metadata(attrs) {
   }
   return m;
 }
-export function buildToSave(obj, table, attrs, ver, buildParam, i) {
+export function buildToSave(obj, table, attrs, buildParam, i) {
   if (!i) {
     i = 1;
   }
@@ -86,7 +86,7 @@ export function buildToSave(obj, table, attrs, ver, buildParam, i) {
     if (v != null && !attr.ignored && !attr.noinsert) {
       const field = attr.column ? attr.column : k;
       cols.push(field);
-      if (k === ver) {
+      if (attr.version) {
         isVersion = true;
         values.push(`${1}`);
       }
@@ -102,11 +102,11 @@ export function buildToSave(obj, table, attrs, ver, buildParam, i) {
           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);
             }
           }
@@ -117,12 +117,6 @@ export function buildToSave(obj, table, attrs, ver, buildParam, i) {
       }
     }
   }
-  if (!isVersion && ver && ver.length > 0) {
-    const attr = attrs[ver];
-    const field = attr.column ? attr.column : ver;
-    cols.push(field);
-    values.push(`${1}`);
-  }
   if (pks.length === 0) {
     if (cols.length === 0) {
       return { query: "", params: args };
@@ -154,11 +148,11 @@ export function buildToSave(obj, table, attrs, ver, buildParam, i) {
             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);
               }
             }
@@ -180,7 +174,7 @@ export function buildToSave(obj, table, attrs, ver, buildParam, i) {
     }
   }
 }
-export function buildToSaveBatch(objs, table, attrs, ver, buildParam) {
+export function buildToSaveBatch(objs, table, attrs, buildParam) {
   if (!buildParam) {
     buildParam = param;
   }
@@ -202,7 +196,7 @@ export function buildToSaveBatch(objs, table, attrs, ver, buildParam) {
       if (v != null && !attr.ignored && !attr.noinsert) {
         const field = attr.column ? attr.column : k;
         cols.push(field);
-        if (k === ver) {
+        if (attr.version) {
           isVersion = true;
           values.push(`${1}`);
         }
@@ -218,11 +212,11 @@ export function buildToSaveBatch(objs, table, attrs, ver, buildParam) {
             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);
               }
             }
@@ -233,18 +227,12 @@ export function buildToSaveBatch(objs, table, attrs, ver, buildParam) {
         }
       }
     }
-    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 = [];
     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) {
+        if (attr && !attr.key && !attr.ignored && !attr.noupdate) {
           const field = attr.column ? attr.column : k;
           let x;
           if (v === null) {
@@ -260,11 +248,11 @@ export function buildToSaveBatch(objs, table, attrs, ver, buildParam) {
             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);
               }
             }
@@ -386,29 +374,23 @@ export class PoolManager {
       });
     });
   }
-  execute(sql, args, ctx) {
-    const p = ctx ? ctx : this.pool;
-    return execute(p, sql, args);
+  execute(sql, args) {
+    return execute(this.pool, sql, args);
   }
-  executeBatch(statements, firstSuccess, ctx) {
-    const p = ctx ? ctx : this.pool;
-    return executeBatch(p, statements, firstSuccess);
+  executeBatch(statements, firstAffected) {
+    return executeBatch(this.pool, statements, firstAffected);
   }
-  query(sql, args, m, bools, ctx) {
-    const p = ctx ? ctx : this.pool;
-    return query(p, sql, args, m, bools);
+  query(sql, args, m, bools) {
+    return query(this.pool, sql, args, m, bools);
   }
-  queryOne(sql, args, m, bools, ctx) {
-    const p = ctx ? ctx : this.pool;
-    return queryOne(p, sql, args, m, bools);
+  queryOne(sql, args, m, bools) {
+    return queryOne(this.pool, sql, args, m, bools);
   }
-  executeScalar(sql, args, ctx) {
-    const p = ctx ? ctx : this.pool;
-    return executeScalar(p, sql, args);
+  executeScalar(sql, args) {
+    return executeScalar(this.pool, sql, args);
   }
-  count(sql, args, ctx) {
-    const p = ctx ? ctx : this.pool;
-    return count(p, sql, args);
+  count(sql, args) {
+    return count(this.pool, sql, args);
   }
 }
 export class PoolConnectionManager {
@@ -459,32 +441,26 @@ export class PoolConnectionManager {
     this.released = true;
     this.connection.release();
   }
-  execute(sql, args, ctx) {
-    const p = ctx ? ctx : this.connection;
-    return execute(p, sql, args);
+  execute(sql, args) {
+    return execute(this.connection, sql, args);
   }
-  executeBatch(statements, firstSuccess, ctx) {
-    const p = ctx ? ctx : this.connection;
-    return executeBatchConnection(p, statements, firstSuccess);
+  executeBatch(statements, firstAffected) {
+    return executeBatchConnection(this.connection, statements, firstAffected);
   }
   query(sql, args, m, bools, ctx) {
-    const p = ctx ? ctx : this.connection;
-    return query(p, sql, args, m, bools);
+    return query(this.connection, sql, args, m, bools);
   }
-  queryOne(sql, args, m, bools, ctx) {
-    const p = ctx ? ctx : this.connection;
-    return queryOne(p, sql, args, m, bools);
+  queryOne(sql, args, m, bools) {
+    return queryOne(this.connection, sql, args, m, bools);
   }
-  executeScalar(sql, args, ctx) {
-    const p = ctx ? ctx : this.connection;
-    return executeScalar(p, sql, args);
+  executeScalar(sql, args) {
+    return executeScalar(this.connection, sql, args);
   }
-  count(sql, args, ctx) {
-    const p = ctx ? ctx : this.connection;
-    return count(p, sql, args);
+  count(sql, args) {
+    return count(this.connection, sql, args);
   }
 }
-export function executeBatch(pool, statements, firstSuccess) {
+export function executeBatch(pool, statements, firstAffected) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!statements || statements.length === 0) {
       return 0;
@@ -494,14 +470,14 @@ export function executeBatch(pool, statements, firstSuccess) {
     }
     const connection = yield getConnection(pool);
     try {
-      return yield executeBatchConnectionTx(connection, statements, firstSuccess);
+      return yield executeBatchConnectionTx(connection, statements, firstAffected);
     }
     finally {
       connection.release();
     }
   });
 }
-export function executeBatchConnectionTx(connection, statements, firstSuccess) {
+export function executeBatchConnectionTx(connection, statements, firstAffected) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!statements || statements.length === 0) {
       return 0;
@@ -513,7 +489,7 @@ export function executeBatchConnectionTx(connection, statements, firstSuccess) {
     try {
       let count = 0;
       if (resource.multipleStatements) {
-        if (firstSuccess) {
+        if (firstAffected) {
           const firstCount = yield execute(connection, statements[0].query, statements[0].params);
           count = firstCount;
           if (firstCount === 0) {
@@ -528,8 +504,8 @@ export function executeBatchConnectionTx(connection, statements, firstSuccess) {
         }
       }
       else {
-        const start = firstSuccess ? 1 : 0;
-        if (firstSuccess) {
+        const start = firstAffected ? 1 : 0;
+        if (firstAffected) {
           const firstCount = yield execute(connection, statements[0].query, statements[0].params);
           count = firstCount;
           if (firstCount === 0) {
@@ -555,7 +531,7 @@ export function executeBatchConnectionTx(connection, statements, firstSuccess) {
     }
   });
 }
-export function executeBatchConnection(connection, statements, firstSuccess) {
+export function executeBatchConnection(connection, statements, firstAffected) {
   return __awaiter(this, void 0, void 0, function* () {
     if (!statements || statements.length === 0) {
       return 0;
@@ -564,7 +540,7 @@ export function executeBatchConnection(connection, statements, firstSuccess) {
       return execute(connection, statements[0].query, statements[0].params);
     }
     if (resource.multipleStatements) {
-      if (firstSuccess) {
+      if (firstAffected) {
         const firstCount = yield execute(connection, statements[0].query, statements[0].params);
         if (firstCount === 0) {
           return 0;
@@ -574,8 +550,8 @@ export function executeBatchConnection(connection, statements, firstSuccess) {
       return executeMultipleStatements(connection, statements);
     }
     let count = 0;
-    const start = firstSuccess ? 1 : 0;
-    if (firstSuccess) {
+    const start = firstAffected ? 1 : 0;
+    if (firstAffected) {
       const firstCount = yield execute(connection, statements[0].query, statements[0].params);
       count = firstCount;
       if (firstCount === 0) {
@@ -693,8 +669,8 @@ 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, ver, buildParam) {
-  const s = buildToSave(obj, table, attrs, ver, buildParam);
+export function save(pool, obj, table, attrs, buildParam) {
+  const s = buildToSave(obj, table, attrs, buildParam);
   if (!s.query) {
     return Promise.resolve(-1);
   }
@@ -705,8 +681,8 @@ export function save(pool, obj, table, attrs, ver, buildParam) {
     return execute(pool, s.query, s.params);
   }
 }
-export function saveBatch(pool, objs, table, attrs, ver, buildParam) {
-  const s = buildToSaveBatch(objs, table, attrs, ver, buildParam);
+export function saveBatch(pool, objs, table, attrs, buildParam) {
+  const s = buildToSaveBatch(objs, table, attrs, buildParam);
   if (typeof pool === "function") {
     return pool(s);
   }
@@ -905,17 +881,6 @@ export class StringAdapter {
     return execute(this.pool, s, values);
   }
 }
-export function version(attrs) {
-  const ks = Object.keys(attrs);
-  for (const k of ks) {
-    const attr = attrs[k];
-    if (attr.version) {
-      attr.name = k;
-      return attr;
-    }
-  }
-  return undefined;
-}
 export class MySQLWriter {
   constructor(pool, table, attributes, oneIfSuccess, map, buildParam) {
     this.pool = pool;
@@ -925,10 +890,6 @@ export class MySQLWriter {
     this.map = map;
     this.write = this.write.bind(this);
     this.param = buildParam ? buildParam : param;
-    const x = version(attributes);
-    if (x) {
-      this.version = x.name;
-    }
   }
   write(obj) {
     if (!obj) {
@@ -938,7 +899,7 @@ export class MySQLWriter {
     if (this.map) {
       obj2 = this.map(obj);
     }
-    const stmt = buildToSave(obj2, this.table, this.attributes, this.version, this.param);
+    const stmt = buildToSave(obj2, this.table, this.attributes, this.param);
     if (stmt.query) {
       if (this.oneIfSuccess) {
         return execute(this.pool, stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0));
@@ -963,10 +924,6 @@ export class MySQLStreamWriter {
     this.write = this.write.bind(this);
     this.flush = this.flush.bind(this);
     this.param = buildParam ? buildParam : param;
-    const x = version(attributes);
-    if (x) {
-      this.version = x.name;
-    }
   }
   write(obj) {
     if (!obj) {
@@ -992,15 +949,15 @@ export class MySQLStreamWriter {
       return Promise.resolve(0);
     }
     else {
-      const total = this.list.length;
-      const stmt = buildToSaveBatch(this.list, this.table, this.attributes, this.version, this.param);
+      const stmt = buildToSaveBatch(this.list, this.table, this.attributes, this.param);
       if (stmt.length > 0) {
         return executeBatch(this.pool, stmt).then((r) => {
           this.list = [];
-          return total;
+          return stmt.length;
         });
       }
       else {
+        this.list = [];
         return Promise.resolve(0);
       }
     }
@@ -1015,10 +972,6 @@ export class MySQLBatchWriter {
     this.map = map;
     this.write = this.write.bind(this);
     this.param = buildParam ? buildParam : param;
-    const x = version(attributes);
-    if (x) {
-      this.version = x.name;
-    }
   }
   write(objs) {
     if (!objs || objs.length === 0) {
@@ -1032,7 +985,7 @@ export class MySQLBatchWriter {
         list.push(obj2);
       }
     }
-    const stmts = buildToSaveBatch(list, this.table, this.attributes, this.version, this.param);
+    const stmts = buildToSaveBatch(list, this.table, this.attributes, this.param);
     if (stmts.length > 0) {
       if (this.oneIfSuccess) {
         return executeBatch(this.pool, stmts).then((ct) => stmts.length);
@@ -1109,38 +1062,38 @@ export class Exporter {
       const reader = this.connection.query(stmt.query, stmt.params);
       let er;
       let i = 0;
-      let k = 0;
+      let j = 0;
       reader.on("error", (err) => (er = err));
       if (this.map) {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
           ++i;
-          k++;
+          j++;
           this.connection.pause();
           const obj = mapOne(row, this.map);
           const data = this.format(obj);
           this.write(data);
           this.connection.resume();
-          if (k >= this.progressSize) {
+          if (j >= this.progressSize) {
             if (this.logInfo) {
               this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
             }
-            k = 0;
+            j = 0;
           }
         }));
       }
       else {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
           ++i;
-          k++;
+          j++;
           this.connection.pause();
           const data = this.format(row);
           this.write(data);
           this.connection.resume();
-          if (k >= this.progressSize) {
+          if (j >= this.progressSize) {
             if (this.logInfo) {
               this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
             }
-            k = 0;
+            j = 0;
           }
         }));
       }
@@ -1187,37 +1140,37 @@ export class ExportService {
       let er;
       reader.on("error", (err) => (er = err));
       let i = 0;
-      let k = 0;
+      let j = 0;
       if (this.map) {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
           ++i;
-          k++;
+          j++;
           this.connection.pause();
           const obj = mapOne(row, this.map);
           const data = this.formatter.format(obj);
           this.writer.write(data);
           this.connection.resume();
-          if (k >= this.progressSize) {
+          if (j >= this.progressSize) {
             if (this.logInfo) {
               this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
             }
-            k = 0;
+            j = 0;
           }
         }));
       }
       else {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
           ++i;
-          k++;
+          j++;
           this.connection.pause();
           const data = this.formatter.format(row);
           this.writer.write(data);
           this.connection.resume();
-          if (k >= this.progressSize) {
+          if (j >= this.progressSize) {
             if (this.logInfo) {
               this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
             }
-            k = 0;
+            j = 0;
           }
         }));
       }

package/package.json

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

package/src/build.ts

@@ -59,7 +59,7 @@ 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 {
+export function buildToSave<T>(obj: T, table: string, attrs: Attributes, buildParam?: (i: number) => string, i?: number): Statement {
   if (!i) {
     i = 1
   }
@@ -86,7 +86,7 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
     if (v != null && !attr.ignored && !attr.noinsert) {
       const field = attr.column ? attr.column : k
       cols.push(field)
-      if (k === ver) {
+      if (attr.version) {
         isVersion = true
         values.push(`${1}`)
       } else {
@@ -99,10 +99,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,12 +112,6 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
       }
     }
   }
-  if (!isVersion && ver && ver.length > 0) {
-    const attr = attrs[ver]
-    const field = attr.column ? attr.column : ver
-    cols.push(field)
-    values.push(`${1}`)
-  }
   if (pks.length === 0) {
     if (cols.length === 0) {
       return { query: "", params: args }
@@ -144,10 +138,10 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
             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 {
@@ -167,7 +161,7 @@ export function buildToSave<T>(obj: T, table: string, attrs: Attributes, ver?: s
     }
   }
 }
-export function buildToSaveBatch<T>(objs: T[], table: string, attrs: Attributes, ver?: string, buildParam?: (i: number) => string): Statement[] {
+export function buildToSaveBatch<T>(objs: T[], table: string, attrs: Attributes, buildParam?: (i: number) => string): Statement[] {
   if (!buildParam) {
     buildParam = param
   }
@@ -189,7 +183,7 @@ export function buildToSaveBatch<T>(objs: T[], table: string, attrs: Attributes,
       if (v != null && !attr.ignored && !attr.noinsert) {
         const field = attr.column ? attr.column : k
         cols.push(field)
-        if (k === ver) {
+        if (attr.version) {
           isVersion = true
           values.push(`${1}`)
         } else {
@@ -202,10 +196,10 @@ export function buildToSaveBatch<T>(objs: T[], table: string, attrs: Attributes,
             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 {
@@ -215,18 +209,12 @@ export function buildToSaveBatch<T>(objs: T[], table: string, attrs: Attributes,
         }
       }
     }
-    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) {
+        if (attr && !attr.key && !attr.ignored && !attr.noupdate) {
           const field = attr.column ? attr.column : k
           let x: string
           if (v === null) {
@@ -239,10 +227,10 @@ 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 {

package/src/index.ts

@@ -113,29 +113,23 @@ export class PoolManager implements DB {
       })
     })
   }
-  execute(sql: string, args?: any[], ctx?: any): Promise<number> {
-    const p = ctx ? ctx : this.pool
-    return execute(p, sql, args)
+  execute(sql: string, args?: any[]): Promise<number> {
+    return execute(this.pool, sql, args)
   }
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number> {
-    const p = ctx ? ctx : this.pool
-    return executeBatch(p, statements, firstSuccess)
+  executeBatch(statements: Statement[], firstAffected?: boolean): Promise<number> {
+    return executeBatch(this.pool, statements, firstAffected)
   }
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]> {
-    const p = ctx ? ctx : this.pool
-    return query(p, sql, args, m, bools)
+  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T[]> {
+    return query(this.pool, sql, args, m, bools)
   }
-  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T | null> {
-    const p = ctx ? ctx : this.pool
-    return queryOne(p, sql, args, m, bools)
+  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T | null> {
+    return queryOne(this.pool, sql, args, m, bools)
   }
-  executeScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T | null> {
-    const p = ctx ? ctx : this.pool
-    return executeScalar<T>(p, sql, args)
+  executeScalar<T>(sql: string, args?: any[]): Promise<T | null> {
+    return executeScalar<T>(this.pool, sql, args)
   }
-  count(sql: string, args?: any[], ctx?: any): Promise<number> {
-    const p = ctx ? ctx : this.pool
-    return count(p, sql, args)
+  count(sql: string, args?: any[]): Promise<number> {
+    return count(this.pool, sql, args)
   }
 }
 // tslint:disable-next-line:max-classes-per-file
@@ -186,32 +180,26 @@ export class PoolConnectionManager implements Transaction {
     this.released = true
     this.connection.release()
   }
-  execute(sql: string, args?: any[], ctx?: any): Promise<number> {
-    const p = ctx ? ctx : this.connection
-    return execute(p, sql, args)
+  execute(sql: string, args?: any[]): Promise<number> {
+    return execute(this.connection, sql, args)
   }
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number> {
-    const p = ctx ? ctx : this.connection
-    return executeBatchConnection(p, statements, firstSuccess)
+  executeBatch(statements: Statement[], firstAffected?: boolean): Promise<number> {
+    return executeBatchConnection(this.connection, statements, firstAffected)
   }
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]> {
-    const p = ctx ? ctx : this.connection
-    return query(p, sql, args, m, bools)
+    return query(this.connection, sql, args, m, bools)
   }
-  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T | null> {
-    const p = ctx ? ctx : this.connection
-    return queryOne(p, sql, args, m, bools)
+  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T | null> {
+    return queryOne(this.connection, sql, args, m, bools)
   }
-  executeScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T | null> {
-    const p = ctx ? ctx : this.connection
-    return executeScalar<T>(p, sql, args)
+  executeScalar<T>(sql: string, args?: any[]): Promise<T | null> {
+    return executeScalar<T>(this.connection, sql, args)
   }
-  count(sql: string, args?: any[], ctx?: any): Promise<number> {
-    const p = ctx ? ctx : this.connection
-    return count(p, sql, args)
+  count(sql: string, args?: any[]): Promise<number> {
+    return count(this.connection, sql, args)
   }
 }
-export async function executeBatch(pool: Pool, statements: Statement[], firstSuccess?: boolean): Promise<number> {
+export async function executeBatch(pool: Pool, statements: Statement[], firstAffected?: boolean): Promise<number> {
   if (!statements || statements.length === 0) {
     return 0
   }
@@ -220,12 +208,12 @@ export async function executeBatch(pool: Pool, statements: Statement[], firstSuc
   }
   const connection = await getConnection(pool)
   try {
-    return await executeBatchConnectionTx(connection, statements, firstSuccess)
+    return await executeBatchConnectionTx(connection, statements, firstAffected)
   } finally {
     connection.release()
   }
 }
-export async function executeBatchConnectionTx(connection: PoolConnection, statements: Statement[], firstSuccess?: boolean): Promise<number> {
+export async function executeBatchConnectionTx(connection: PoolConnection, statements: Statement[], firstAffected?: boolean): Promise<number> {
   if (!statements || statements.length === 0) {
     return 0
   }
@@ -237,7 +225,7 @@ export async function executeBatchConnectionTx(connection: PoolConnection, state
     let count = 0
 
     if (resource.multipleStatements) {
-      if (firstSuccess) {
+      if (firstAffected) {
         const firstCount = await execute(connection, statements[0].query, statements[0].params)
 
         count = firstCount
@@ -252,8 +240,8 @@ export async function executeBatchConnectionTx(connection: PoolConnection, state
         count = await executeMultipleStatements(connection, statements)
       }
     } else {
-      const start = firstSuccess ? 1 : 0
-      if (firstSuccess) {
+      const start = firstAffected ? 1 : 0
+      if (firstAffected) {
         const firstCount = await execute(connection, statements[0].query, statements[0].params)
         count = firstCount
         if (firstCount === 0) {
@@ -276,12 +264,11 @@ export async function executeBatchConnectionTx(connection: PoolConnection, state
     } catch {
       // Preserve the original error.
     }
-
     throw buildError(err)
   }
 }
 
-export async function executeBatchConnection(connection: PoolConnection, statements: Statement[], firstSuccess?: boolean): Promise<number> {
+export async function executeBatchConnection(connection: PoolConnection, statements: Statement[], firstAffected?: boolean): Promise<number> {
   if (!statements || statements.length === 0) {
     return 0
   }
@@ -291,7 +278,7 @@ export async function executeBatchConnection(connection: PoolConnection, stateme
   }
 
   if (resource.multipleStatements) {
-    if (firstSuccess) {
+    if (firstAffected) {
       const firstCount = await execute(connection, statements[0].query, statements[0].params)
 
       if (firstCount === 0) {
@@ -305,9 +292,9 @@ export async function executeBatchConnection(connection: PoolConnection, stateme
   }
 
   let count = 0
-  const start = firstSuccess ? 1 : 0
+  const start = firstAffected ? 1 : 0
 
-  if (firstSuccess) {
+  if (firstAffected) {
     const firstCount = await execute(connection, statements[0].query, statements[0].params)
 
     count = firstCount
@@ -437,8 +424,8 @@ export function count(pool: Pool | PoolConnection, sql: string, args?: any[]): P
   return executeScalar<number>(pool, sql, args).then((res) => (res !== null ? res : 0))
 }
 
-export function save<T>(pool: Pool | PoolConnection | ((sql: string, args?: any[]) => Promise<number>), obj: T, table: string, attrs: Attributes, ver?: string, buildParam?: (i: number) => string): Promise<number> {
-  const s = buildToSave(obj, table, attrs, ver, buildParam)
+export function save<T>(pool: Pool | PoolConnection | ((sql: string, args?: any[]) => Promise<number>), obj: T, table: string, attrs: Attributes, buildParam?: (i: number) => string): Promise<number> {
+  const s = buildToSave(obj, table, attrs, buildParam)
   if (!s.query) {
     return Promise.resolve(-1)
   }
@@ -448,8 +435,8 @@ export function save<T>(pool: Pool | PoolConnection | ((sql: string, args?: any[
     return execute(pool, s.query, s.params)
   }
 }
-export function saveBatch<T>(pool: Pool | ((statements: Statement[]) => Promise<number>), objs: T[], table: string, attrs: Attributes, ver?: string, buildParam?: (i: number) => string): Promise<number> {
-  const s = buildToSaveBatch(objs, table, attrs, ver, buildParam)
+export function saveBatch<T>(pool: Pool | ((statements: Statement[]) => Promise<number>), objs: T[], table: string, attrs: Attributes, buildParam?: (i: number) => string): Promise<number> {
+  const s = buildToSaveBatch(objs, table, attrs, buildParam)
   if (typeof pool === "function") {
     return pool(s)
   } else {
@@ -647,20 +634,8 @@ export class StringAdapter {
   }
 }
 
-export function version(attrs: Attributes): Attribute | undefined {
-  const ks = Object.keys(attrs)
-  for (const k of ks) {
-    const attr = attrs[k]
-    if (attr.version) {
-      attr.name = k
-      return attr
-    }
-  }
-  return undefined
-}
 // tslint:disable-next-line:max-classes-per-file
 export class MySQLWriter<T> {
-  protected version?: string
   protected param?: (i: number) => string
   constructor(
     protected pool: Pool | PoolConnection,
@@ -672,10 +647,6 @@ export class MySQLWriter<T> {
   ) {
     this.write = this.write.bind(this)
     this.param = buildParam ? buildParam : param
-    const x = version(attributes)
-    if (x) {
-      this.version = x.name
-    }
   }
   write(obj: T): Promise<number> {
     if (!obj) {
@@ -685,7 +656,7 @@ export class MySQLWriter<T> {
     if (this.map) {
       obj2 = this.map(obj)
     }
-    const stmt = buildToSave(obj2, this.table, this.attributes, this.version, this.param)
+    const stmt = buildToSave(obj2, this.table, this.attributes, this.param)
     if (stmt.query) {
       if (this.oneIfSuccess) {
         return execute(this.pool, stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0))
@@ -700,7 +671,6 @@ export class MySQLWriter<T> {
 // tslint:disable-next-line:max-classes-per-file
 export class MySQLStreamWriter<T> {
   protected list: T[] = []
-  protected version?: string
   protected param?: (i: number) => string
   constructor(
     protected pool: Pool,
@@ -713,10 +683,6 @@ export class MySQLStreamWriter<T> {
     this.write = this.write.bind(this)
     this.flush = this.flush.bind(this)
     this.param = buildParam ? buildParam : param
-    const x = version(attributes)
-    if (x) {
-      this.version = x.name
-    }
   }
   write(obj: T): Promise<number> {
     if (!obj) {
@@ -739,14 +705,14 @@ export class MySQLStreamWriter<T> {
     if (!this.list || this.list.length === 0) {
       return Promise.resolve(0)
     } else {
-      const total = this.list.length
-      const stmt = buildToSaveBatch(this.list, this.table, this.attributes, this.version, this.param)
+      const stmt = buildToSaveBatch(this.list, this.table, this.attributes, this.param)
       if (stmt.length > 0) {
         return executeBatch(this.pool as any, stmt).then((r) => {
           this.list = []
-          return total
+          return stmt.length
         })
       } else {
+        this.list = []
         return Promise.resolve(0)
       }
     }
@@ -754,7 +720,6 @@ export class MySQLStreamWriter<T> {
 }
 // tslint:disable-next-line:max-classes-per-file
 export class MySQLBatchWriter<T> {
-  protected version?: string
   protected param?: (i: number) => string
   constructor(
     protected pool: Pool,
@@ -766,10 +731,6 @@ export class MySQLBatchWriter<T> {
   ) {
     this.write = this.write.bind(this)
     this.param = buildParam ? buildParam : param
-    const x = version(attributes)
-    if (x) {
-      this.version = x.name
-    }
   }
   write(objs: T[]): Promise<number> {
     if (!objs || objs.length === 0) {
@@ -783,7 +744,7 @@ export class MySQLBatchWriter<T> {
         list.push(obj2)
       }
     }
-    const stmts = buildToSaveBatch(list, this.table, this.attributes, this.version, this.param)
+    const stmts = buildToSaveBatch(list, this.table, this.attributes, this.param)
     if (stmts.length > 0) {
       if (this.oneIfSuccess) {
         return executeBatch(this.pool, stmts).then((ct) => stmts.length)
@@ -903,38 +864,38 @@ export class Exporter<T> {
     const reader = this.connection.query(stmt.query, stmt.params)
     let er: any
     let i = 0
-    let k = 0
+    let j = 0
     reader.on("error", (err) => (er = err))
     // (D2) WRITE ROW-BY-ROW
     if (this.map) {
       reader.on("result", async (row: any) => {
         ++i
-        k++
+        j++
         this.connection.pause()
         const obj = mapOne<T>(row, this.map)
         const data = this.format(obj)
         this.write(data)
         this.connection.resume()
-        if (k >= this.progressSize) {
+        if (j >= this.progressSize) {
           if (this.logInfo) {
             this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`)
           }
-          k = 0
+          j = 0
         }
       })
     } else {
       reader.on("result", async (row: any) => {
         ++i
-        k++
+        j++
         this.connection.pause()
         const data = this.format(row as T)
         this.write(data)
         this.connection.resume()
-        if (k >= this.progressSize) {
+        if (j >= this.progressSize) {
           if (this.logInfo) {
             this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`)
           }
-          k = 0
+          j = 0
         }
       })
     }
@@ -981,37 +942,37 @@ export class ExportService<T> {
     let er: any
     reader.on("error", (err) => (er = err))
     let i = 0
-    let k = 0
+    let j = 0
     // (D2) WRITE ROW-BY-ROW
     if (this.map) {
       reader.on("result", async (row: any) => {
         ++i
-        k++
+        j++
         this.connection.pause()
         const obj = mapOne<T>(row, this.map)
         const data = this.formatter.format(obj)
         this.writer.write(data)
         this.connection.resume()
-        if (k >= this.progressSize) {
+        if (j >= this.progressSize) {
           if (this.logInfo) {
             this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`)
           }
-          k = 0
+          j = 0
         }
       })
     } else {
       reader.on("result", async (row: any) => {
         ++i
-        k++
+        j++
         this.connection.pause()
         const data = this.formatter.format(row as T)
         this.writer.write(data)
         this.connection.resume()
-        if (k >= this.progressSize) {
+        if (j >= this.progressSize) {
           if (this.logInfo) {
             this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`)
           }
-          k = 0
+          j = 0
         }
       })
     }

package/src/metadata.ts

@@ -9,12 +9,12 @@ export interface Statement {
 export interface Executor {
   driver: string
   param(i: number): string
-  execute(sql: string, args?: any[], ctx?: any): Promise<number>
-  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
-  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
-  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T | null>
-  executeScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T | null>
-  count(sql: string, args?: any[], ctx?: any): Promise<number>
+  execute(sql: string, args?: any[]): Promise<number>
+  executeBatch(statements: Statement[], firstAffected?: boolean): Promise<number>
+  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T[]>
+  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T | null>
+  executeScalar<T>(sql: string, args?: any[]): Promise<T | null>
+  count(sql: string, args?: any[]): Promise<number>
 }
 export interface Transaction extends Executor {
   commit(): Promise<void>