mysql2-core 0.3.8 → 0.3.10

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'`;
+              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'`;
+                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;
   }
@@ -199,10 +193,10 @@ export function buildToSaveBatch(objs, table, attrs, ver, buildParam) {
       if (v == null) {
         v = attr.default;
       }
-      if (v != null && v !== undefined && !attr.ignored && !attr.noinsert) {
+      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'`;
+                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'`;
+                const v2 = attr.false !== undefined ? attr.false : `'0'`;
                 args.push(v2);
               }
             }
@@ -301,8 +289,7 @@ export function createPool(conf) {
   if (conf.max && conf.max > 0 && !conf.connectionLimit) {
     conf.connectionLimit = conf.max;
   }
-  const pool = createPool2(Object.assign(Object.assign({}, conf), { rowsAsArray: true }));
-  return pool;
+  return createPool2(Object.assign(Object.assign({}, conf), { rowsAsArray: true }));
 }
 export function getConnection(pool) {
   return new Promise((resolve, reject) => {
@@ -321,7 +308,7 @@ export function beginTransaction(connection, rollbackIfError) {
         if (!rollbackIfError) {
           return reject(err);
         }
-        connection.rollback(() => {
+        return connection.rollback(() => {
           return reject(err);
         });
       }
@@ -336,11 +323,11 @@ export function commit(connection, rollbackIfError) {
         if (!rollbackIfError) {
           return reject(err);
         }
-        connection.rollback(() => {
+        return connection.rollback(() => {
           return reject(err);
         });
       }
-      resolve();
+      return resolve();
     });
   });
 }
@@ -350,7 +337,7 @@ export function rollback(connection) {
       if (err) {
         return reject(err);
       }
-      resolve();
+      return resolve();
     });
   });
 }
@@ -371,50 +358,45 @@ export class PoolManager {
   }
   beginTransaction() {
     return new Promise((resolve, reject) => {
-      this.pool.getConnection((er0, connection) => {
-        if (er0) {
-          return reject(er0);
+      this.pool.getConnection((err, connection) => {
+        if (err) {
+          return reject(err);
         }
-        connection.beginTransaction((er1) => {
-          if (er1) {
-            connection.rollback(() => {
-              return reject(er1);
+        connection.beginTransaction((beginError) => {
+          if (beginError) {
+            return connection.rollback(() => {
+              connection.release();
+              return reject(beginError);
             });
           }
-          const tx = new PoolConnectionManager(connection);
-          return resolve(tx);
+          return resolve(new PoolConnectionManager(connection));
         });
       });
     });
   }
-  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 {
   constructor(connection) {
     this.connection = connection;
+    this.released = false;
     this.driver = "mysql";
     this.param = this.param.bind(this);
     this.execute = this.execute.bind(this);
@@ -429,368 +411,204 @@ export class PoolConnectionManager {
   }
   commit() {
     return new Promise((resolve, reject) => {
-      this.connection.commit((er3) => {
-        if (er3) {
-          return reject(er3);
+      this.connection.commit((err) => {
+        if (err) {
+          return this.connection.rollback(() => {
+            this.release();
+            return reject(err);
+          });
         }
+        this.release();
         return resolve();
       });
     });
   }
   rollback() {
     return new Promise((resolve, reject) => {
-      this.connection.rollback((er3) => {
-        if (er3) {
-          return reject(er3);
+      this.connection.rollback((err) => {
+        this.release();
+        if (err) {
+          return reject(err);
         }
         return resolve();
       });
     });
   }
-  execute(sql, args, ctx) {
-    const p = ctx ? ctx : this.connection;
-    return execute(p, sql, args);
+  release() {
+    if (this.released) {
+      return;
+    }
+    this.released = true;
+    this.connection.release();
+  }
+  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 Promise.resolve(0);
+      return 0;
     }
-    else if (statements.length === 1) {
+    if (statements.length === 1) {
       return execute(pool, statements[0].query, statements[0].params);
     }
-    return new Promise((resolve, reject) => {
-      pool.getConnection((er0, connection) => {
-        if (er0) {
-          return reject(er0);
-        }
-        return executeBatchConnectionTx(connection, statements, firstSuccess);
-      });
-    });
+    const connection = yield getConnection(pool);
+    try {
+      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 Promise.resolve(0);
+      return 0;
     }
-    else if (statements.length === 1) {
+    if (statements.length === 1) {
       return execute(connection, statements[0].query, statements[0].params);
     }
-    if (resource.multipleStatements) {
-      if (firstSuccess) {
-        return new Promise((resolve, reject) => {
-          connection.beginTransaction((er1) => {
-            if (er1) {
-              connection.rollback(() => {
-                return reject(er1);
-              });
-            }
-            else {
-              connection.execute(statements[0].query, toArray(statements[0].params), (er2a, results0) => {
-                if (er2a) {
-                  connection.rollback(() => {
-                    return reject(er2a);
-                  });
-                }
-                else {
-                  if (results0 && results0.affectedRows === 0) {
-                    connection.commit((er3) => {
-                      if (er3) {
-                        connection.rollback(() => {
-                          return reject(er3);
-                        });
-                      }
-                    });
-                    return 0;
-                  }
-                  else {
-                    const queries = [];
-                    const params = [];
-                    const l = statements.length;
-                    for (let j = 1; j < l; j++) {
-                      const item = statements[j];
-                      if (item.query.endsWith(";")) {
-                        queries.push(item.query);
-                      }
-                      else {
-                        queries.push(item.query + ";");
-                      }
-                      if (item.params && item.params.length > 0) {
-                        for (const p of item.params) {
-                          params.push(p);
-                        }
-                      }
-                    }
-                    connection.query(queries.join(""), toArray(params), (er2, results) => {
-                      if (er2) {
-                        connection.rollback(() => {
-                          return reject(er2);
-                        });
-                      }
-                      else {
-                        connection.commit((er3) => {
-                          if (er3) {
-                            connection.rollback(() => {
-                              return reject(er3);
-                            });
-                          }
-                        });
-                        let c = 0;
-                        c += results0.affectedRows + results.affectedRows;
-                        return resolve(c);
-                      }
-                    });
-                  }
-                }
-              });
-            }
-          });
-        });
-      }
-      else {
-        return new Promise((resolve, reject) => {
-          connection.beginTransaction((er1) => {
-            if (er1) {
-              connection.rollback(() => {
-                return reject(er1);
-              });
-            }
-            else {
-              const queries = [];
-              const params = [];
-              statements.forEach((item) => {
-                if (item.query.endsWith(";")) {
-                  queries.push(item.query);
-                }
-                else {
-                  queries.push(item.query + ";");
-                }
-                if (item.params && item.params.length > 0) {
-                  for (const p of item.params) {
-                    params.push(p);
-                  }
-                }
-              });
-              connection.query(queries.join(""), toArray(params), (er2, results) => {
-                if (er2) {
-                  connection.rollback(() => {
-                    buildError(er2);
-                    return reject(er2);
-                  });
-                }
-                else {
-                  connection.commit((er3) => {
-                    if (er3) {
-                      connection.rollback(() => {
-                        return reject(er3);
-                      });
-                    }
-                  });
-                  return resolve(results.affectedRows);
-                }
-              });
-            }
-          });
-        });
-      }
-    }
-    else {
-      if (firstSuccess) {
-        try {
-          yield beginTransaction(connection, true);
-          let count = yield execute(connection, statements[0].query, toArray(statements[0].params));
-          if (count === 0) {
-            commit(connection, true);
+    yield beginTransaction(connection, true);
+    try {
+      let count = 0;
+      if (resource.multipleStatements) {
+        if (firstAffected) {
+          const firstCount = yield execute(connection, statements[0].query, statements[0].params);
+          count = firstCount;
+          if (firstCount === 0) {
+            yield commit(connection, true);
             return 0;
           }
-          const l = statements.length;
-          for (let j = 1; j < l; j++) {
-            const item = statements[j];
-            const c = yield execute(connection, item.query, toArray(item.params));
-            count = count + c;
-          }
-          commit(connection, true);
-          return count;
+          const remaining = statements.slice(1);
+          count += yield executeMultipleStatements(connection, remaining);
         }
-        catch (err) {
-          rollback(connection);
-          throw err;
+        else {
+          count = yield executeMultipleStatements(connection, statements);
         }
       }
       else {
-        try {
-          yield beginTransaction(connection, true);
-          let count = 0;
-          const l = statements.length;
-          for (let j = 0; j < l; j++) {
-            const item = statements[j];
-            const c = yield execute(connection, item.query, toArray(item.params));
-            count = count + c;
+        const start = firstAffected ? 1 : 0;
+        if (firstAffected) {
+          const firstCount = yield execute(connection, statements[0].query, statements[0].params);
+          count = firstCount;
+          if (firstCount === 0) {
+            yield commit(connection, true);
+            return 0;
           }
-          commit(connection, true);
-          return count;
         }
-        catch (err) {
-          rollback(connection);
-          throw err;
+        for (let i = start; i < statements.length; i++) {
+          const item = statements[i];
+          count += yield execute(connection, item.query, item.params);
         }
       }
+      yield commit(connection, true);
+      return count;
+    }
+    catch (err) {
+      try {
+        yield rollback(connection);
+      }
+      catch (_a) {
+      }
+      throw buildError(err);
     }
   });
 }
-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 Promise.resolve(0);
+      return 0;
     }
-    else if (statements.length === 1) {
+    if (statements.length === 1) {
       return execute(connection, statements[0].query, statements[0].params);
     }
     if (resource.multipleStatements) {
-      if (firstSuccess) {
-        return new Promise((resolve, reject) => {
-          connection.execute(statements[0].query, toArray(statements[0].params), (er2a, results0) => {
-            if (er2a) {
-              return reject(er2a);
-            }
-            else {
-              if (results0 && results0.affectedRows === 0) {
-                return 0;
-              }
-              else {
-                const queries = [];
-                const params = [];
-                const l = statements.length;
-                for (let j = 1; j < l; j++) {
-                  const item = statements[j];
-                  if (item.query.endsWith(";")) {
-                    queries.push(item.query);
-                  }
-                  else {
-                    queries.push(item.query + ";");
-                  }
-                  if (item.params && item.params.length > 0) {
-                    for (const p of item.params) {
-                      params.push(p);
-                    }
-                  }
-                }
-                connection.query(queries.join(""), toArray(params), (er2, results) => {
-                  if (er2) {
-                    return reject(er2);
-                  }
-                  else {
-                    let c = 0;
-                    c += results0.affectedRows + results.affectedRows;
-                    return resolve(c);
-                  }
-                });
-              }
-            }
-          });
-        });
+      if (firstAffected) {
+        const firstCount = yield execute(connection, statements[0].query, statements[0].params);
+        if (firstCount === 0) {
+          return 0;
+        }
+        return firstCount + (yield executeMultipleStatements(connection, statements.slice(1)));
       }
-      else {
-        return new Promise((resolve, reject) => {
-          const queries = [];
-          const params = [];
-          statements.forEach((item) => {
-            if (item.query.endsWith(";")) {
-              queries.push(item.query);
-            }
-            else {
-              queries.push(item.query + ";");
-            }
-            if (item.params && item.params.length > 0) {
-              for (const p of item.params) {
-                params.push(p);
-              }
-            }
-          });
-          connection.query(queries.join(""), toArray(params), (er2, results) => {
-            if (er2) {
-              connection.rollback(() => {
-                buildError(er2);
-                return reject(er2);
-              });
-            }
-            else {
-              connection.commit((er3) => {
-                if (er3) {
-                  connection.rollback(() => {
-                    return reject(er3);
-                  });
-                }
-              });
-              return resolve(results.affectedRows);
-            }
-          });
-        });
+      return executeMultipleStatements(connection, statements);
+    }
+    let count = 0;
+    const start = firstAffected ? 1 : 0;
+    if (firstAffected) {
+      const firstCount = yield execute(connection, statements[0].query, statements[0].params);
+      count = firstCount;
+      if (firstCount === 0) {
+        return 0;
       }
     }
-    else {
-      if (firstSuccess) {
-        try {
-          let count = yield execute(connection, statements[0].query, toArray(statements[0].params));
-          if (count === 0) {
-            return 0;
-          }
-          const l = statements.length;
-          try {
-            for (let j = 1; j < l; j++) {
-              const item = statements[j];
-              const c = yield execute(connection, item.query, toArray(item.params));
-              count = count + c;
-            }
-            return count;
-          }
-          catch (er1) {
-            throw er1;
-          }
-        }
-        catch (er0) {
-          throw er0;
-        }
+    for (let i = start; i < statements.length; i++) {
+      const item = statements[i];
+      count += yield execute(connection, item.query, item.params);
+    }
+    return count;
+  });
+}
+function executeMultipleStatements(connection, statements) {
+  return __awaiter(this, void 0, void 0, function* () {
+    if (!statements || statements.length === 0) {
+      return 0;
+    }
+    const queries = [];
+    const params = [];
+    for (const item of statements) {
+      queries.push(ensureSemicolon(item.query));
+      if (item.params && item.params.length > 0) {
+        params.push(...item.params);
       }
-      else {
-        let count = 0;
-        const l = statements.length;
-        try {
-          for (let j = 0; j < l; j++) {
-            const item = statements[j];
-            const c = yield execute(connection, item.query, toArray(item.params));
-            count = count + c;
-          }
-          return count;
-        }
-        catch (err) {
-          throw err;
+    }
+    return new Promise((resolve, reject) => {
+      connection.query(queries.join(""), toArray(params), (err, results) => {
+        if (err) {
+          buildError(err);
+          return reject(err);
         }
+        return resolve(getAffectedRows(results));
+      });
+    });
+  });
+}
+function ensureSemicolon(sql) {
+  return sql.endsWith(";") ? sql : `${sql};`;
+}
+function getAffectedRows(results) {
+  if (!results) {
+    return 0;
+  }
+  if (Array.isArray(results)) {
+    let count = 0;
+    for (const result of results) {
+      if (result && typeof result.affectedRows === "number") {
+        count += result.affectedRows;
       }
     }
-  });
+    return count;
+  }
+  if (typeof results.affectedRows === "number") {
+    return results.affectedRows;
+  }
+  return 0;
 }
 function buildError(err) {
   if (err.errno === 1062 && err.code === "ER_DUP_ENTRY") {
@@ -802,14 +620,12 @@ export function execute(pool, sql, args) {
   return __awaiter(this, void 0, void 0, function* () {
     const p = toArray(args);
     return new Promise((resolve, reject) => {
-      return pool.execute(sql, p, (err, res) => {
+      pool.execute(sql, p, (err, res) => {
         if (err) {
           buildError(err);
           return reject(err);
         }
-        else {
-          return resolve(res.affectedRows);
-        }
+        return resolve(res.affectedRows);
       });
     });
   });
@@ -818,26 +634,20 @@ export function query(pool, sql, args, m, bools) {
   return __awaiter(this, void 0, void 0, function* () {
     const p = toArray(args);
     return new Promise((resolve, reject) => {
-      return pool.query(sql, p, (err, results, fields) => {
+      pool.query(sql, p, (err, results, fields) => {
         if (err) {
           return reject(err);
         }
-        else {
-          if (results.length > 0) {
-            const arrayResult = results.map((item) => {
-              if (Array.isArray(item)) {
-                return formatData(fields, item);
-              }
-              else {
-                return item;
-              }
-            });
-            return resolve(handleResults(arrayResult, m, bools));
-          }
-          else {
-            resolve([]);
-          }
+        if (results.length === 0) {
+          return resolve([]);
         }
+        const arrayResult = results.map((item) => {
+          if (Array.isArray(item)) {
+            return formatData(fields, item);
+          }
+          return item;
+        });
+        return resolve(handleResults(arrayResult, m, bools));
       });
     });
   });
@@ -852,17 +662,15 @@ export function executeScalar(pool, sql, args) {
     if (!r) {
       return null;
     }
-    else {
-      const keys = Object.keys(r);
-      return r[keys[0]];
-    }
+    const keys = Object.keys(r);
+    return r[keys[0]];
   });
 }
 export function count(pool, sql, args) {
-  return executeScalar(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);
   }
@@ -873,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);
   }
@@ -887,30 +695,25 @@ export function toArray(arr) {
     return [];
   }
   const p = [];
-  const l = arr.length;
-  for (let i = 0; i < l; i++) {
-    if (arr[i] === undefined || arr[i] == null) {
+  for (const value of arr) {
+    if (value === undefined || value === null) {
       p.push(null);
+      continue;
     }
-    else {
-      if (typeof arr[i] === "object") {
-        if (arr[i] instanceof Date) {
-          p.push(arr[i]);
-        }
-        else {
-          if (resource.string) {
-            const s = JSON.stringify(arr[i]);
-            p.push(s);
-          }
-          else {
-            p.push(arr[i]);
-          }
-        }
+    if (typeof value === "object") {
+      if (value instanceof Date) {
+        p.push(value);
+        continue;
+      }
+      if (resource.string) {
+        p.push(JSON.stringify(value));
       }
       else {
-        p.push(arr[i]);
+        p.push(value);
       }
+      continue;
     }
+    p.push(value);
   }
   return p;
 }
@@ -920,18 +723,12 @@ export function handleResults(r, m, bools) {
     if (bools && bools.length > 0) {
       return handleBool(res, bools);
     }
-    else {
-      return res;
-    }
+    return res;
   }
-  else {
-    if (bools && bools.length > 0) {
-      return handleBool(r, bools);
-    }
-    else {
-      return r;
-    }
+  if (bools && bools.length > 0) {
+    return handleBool(r, bools);
   }
+  return r;
 }
 export function handleBool(objs, bools) {
   if (!bools || bools.length === 0 || !objs) {
@@ -940,17 +737,19 @@ export function handleBool(objs, bools) {
   for (const obj of objs) {
     const o = obj;
     for (const field of bools) {
-      if (field.name) {
-        const v = o[field.name];
-        if (typeof v !== "boolean" && v != null && v !== undefined) {
-          const b = field.true;
-          if (b == null || b === undefined) {
-            o[field.name] = "1" == v || "T" == v || "Y" == v || "true" == v || "on" == v;
-          }
-          else {
-            o[field.name] = v == b ? true : false;
-          }
-        }
+      if (!field.name) {
+        continue;
+      }
+      const v = o[field.name];
+      if (typeof v === "boolean" || v == null) {
+        continue;
+      }
+      const b = field.true;
+      if (b == null) {
+        o[field.name] = "1" == v || "T" == v || "Y" == v || "true" == v || "on" == v;
+      }
+      else {
+        o[field.name] = v == b;
       }
     }
   }
@@ -960,7 +759,7 @@ export function formatData(nameColumn, data, m) {
   const result = {};
   nameColumn.forEach((item, index) => {
     let key = item.name;
-    if (m) {
+    if (m && m[item.name]) {
       key = m[item.name];
     }
     result[key] = data[index];
@@ -995,9 +794,7 @@ export function mapArray(results, m) {
     return results;
   }
   const objs = [];
-  const length = results.length;
-  for (let i = 0; i < length; i++) {
-    const obj = results[i];
+  for (const obj of results) {
     const obj2 = {};
     const keys = Object.keys(obj);
     for (const key of keys) {
@@ -1058,7 +855,7 @@ export function getMapField(name, mp) {
 export function isEmpty(s) {
   return !(s && s.length > 0);
 }
-export class StringService {
+export class StringAdapter {
   constructor(pool, table, column) {
     this.pool = pool;
     this.table = table;
@@ -1084,35 +881,15 @@ export class StringService {
     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, toDB, buildParam) {
+  constructor(pool, table, attributes, oneIfSuccess, map, buildParam) {
+    this.pool = pool;
     this.table = table;
     this.attributes = attributes;
     this.oneIfSuccess = oneIfSuccess;
+    this.map = map;
     this.write = this.write.bind(this);
-    if (typeof pool === "function") {
-      this.execute = pool;
-    }
-    else {
-      this.pool = pool;
-    }
-    this.param = buildParam;
-    this.map = toDB;
-    const x = version(attributes);
-    if (x) {
-      this.version = x.name;
-    }
+    this.param = buildParam ? buildParam : param;
   }
   write(obj) {
     if (!obj) {
@@ -1122,23 +899,13 @@ 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.execute) {
-        if (this.oneIfSuccess) {
-          return this.execute(stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0));
-        }
-        else {
-          return this.execute(stmt.query, stmt.params);
-        }
+      if (this.oneIfSuccess) {
+        return execute(this.pool, stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0));
       }
       else {
-        if (this.oneIfSuccess) {
-          return execute(this.pool, stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0));
-        }
-        else {
-          return execute(this.pool, stmt.query, stmt.params);
-        }
+        return execute(this.pool, stmt.query, stmt.params);
       }
     }
     else {
@@ -1147,28 +914,16 @@ export class MySQLWriter {
   }
 }
 export class MySQLStreamWriter {
-  constructor(pool, table, attributes, size, toDB, buildParam) {
+  constructor(pool, table, attributes, size = 1000, map, buildParam) {
+    this.pool = pool;
     this.table = table;
     this.attributes = attributes;
+    this.size = size;
+    this.map = map;
     this.list = [];
-    this.size = 0;
     this.write = this.write.bind(this);
     this.flush = this.flush.bind(this);
-    if (typeof pool === "function") {
-      this.executeBatch = pool;
-    }
-    else {
-      this.pool = pool;
-    }
-    this.param = buildParam;
-    this.map = toDB;
-    const x = version(attributes);
-    if (x) {
-      this.version = x.name;
-    }
-    if (size) {
-      this.size = size;
-    }
+    this.param = buildParam ? buildParam : param;
   }
   write(obj) {
     if (!obj) {
@@ -1194,46 +949,29 @@ 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) {
-        if (this.executeBatch) {
-          return this.executeBatch(stmt).then((r) => {
-            this.list = [];
-            return total;
-          });
-        }
-        else {
-          return executeBatch(this.pool, stmt).then((r) => {
-            this.list = [];
-            return total;
-          });
-        }
+        return executeBatch(this.pool, stmt).then((r) => {
+          this.list = [];
+          return stmt.length;
+        });
       }
       else {
+        this.list = [];
         return Promise.resolve(0);
       }
     }
   }
 }
 export class MySQLBatchWriter {
-  constructor(pool, table, attributes, oneIfSuccess, toDB, buildParam) {
+  constructor(pool, table, attributes, oneIfSuccess, map, buildParam) {
+    this.pool = pool;
     this.table = table;
     this.attributes = attributes;
     this.oneIfSuccess = oneIfSuccess;
+    this.map = map;
     this.write = this.write.bind(this);
-    if (typeof pool === "function") {
-      this.execute = pool;
-    }
-    else {
-      this.pool = pool;
-    }
-    this.param = buildParam;
-    this.map = toDB;
-    const x = version(attributes);
-    if (x) {
-      this.version = x.name;
-    }
+    this.param = buildParam ? buildParam : param;
   }
   write(objs) {
     if (!objs || objs.length === 0) {
@@ -1247,23 +985,13 @@ 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.execute) {
-        if (this.oneIfSuccess) {
-          return this.execute(stmts).then((ct) => stmts.length);
-        }
-        else {
-          return this.execute(stmts);
-        }
+      if (this.oneIfSuccess) {
+        return executeBatch(this.pool, stmts).then((ct) => stmts.length);
       }
       else {
-        if (this.oneIfSuccess) {
-          return executeBatch(this.pool, stmts).then((ct) => stmts.length);
-        }
-        else {
-          return executeBatch(this.pool, stmts);
-        }
+        return executeBatch(this.pool, stmts);
       }
     }
     else {
@@ -1313,13 +1041,16 @@ export class MySQLChecker {
   }
 }
 export class Exporter {
-  constructor(connection, buildQuery, ft, write, end, attributes) {
+  constructor(connection, filename, buildQuery, format, write, end, attributes, logInfo, progressSize = 10000) {
     this.connection = connection;
+    this.filename = filename;
     this.buildQuery = buildQuery;
+    this.format = format;
     this.write = write;
     this.end = end;
     this.attributes = attributes;
-    this.format = ft;
+    this.logInfo = logInfo;
+    this.progressSize = progressSize;
     if (attributes) {
       this.map = buildMap(attributes);
     }
@@ -1327,28 +1058,43 @@ export class Exporter {
   }
   export(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-      let idx = 0;
       const stmt = yield this.buildQuery(ctx);
       const reader = this.connection.query(stmt.query, stmt.params);
       let er;
+      let i = 0;
+      let j = 0;
       reader.on("error", (err) => (er = err));
       if (this.map) {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
-          ++idx;
+          ++i;
+          j++;
           this.connection.pause();
           const obj = mapOne(row, this.map);
           const data = this.format(obj);
           this.write(data);
           this.connection.resume();
+          if (j >= this.progressSize) {
+            if (this.logInfo) {
+              this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
+            }
+            j = 0;
+          }
         }));
       }
       else {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
-          ++idx;
+          ++i;
+          j++;
           this.connection.pause();
           const data = this.format(row);
           this.write(data);
           this.connection.resume();
+          if (j >= this.progressSize) {
+            if (this.logInfo) {
+              this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
+            }
+            j = 0;
+          }
         }));
       }
       return new Promise((resolve, reject) => {
@@ -1363,7 +1109,7 @@ export class Exporter {
                 reject(err);
               }
               else {
-                resolve(idx);
+                resolve(i);
               }
             });
           }
@@ -1373,12 +1119,15 @@ export class Exporter {
   }
 }
 export class ExportService {
-  constructor(connection, queryBuilder, formatter, writer, attributes) {
+  constructor(connection, filename, queryBuilder, formatter, writer, attributes, logInfo, progressSize = 10000) {
     this.connection = connection;
+    this.filename = filename;
     this.queryBuilder = queryBuilder;
     this.formatter = formatter;
     this.writer = writer;
     this.attributes = attributes;
+    this.logInfo = logInfo;
+    this.progressSize = progressSize;
     if (attributes) {
       this.map = buildMap(attributes);
     }
@@ -1386,28 +1135,43 @@ export class ExportService {
   }
   export(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
-      let idx = 0;
       const stmt = yield this.queryBuilder.build(ctx);
       const reader = this.connection.query(stmt.query, stmt.params);
       let er;
       reader.on("error", (err) => (er = err));
+      let i = 0;
+      let j = 0;
       if (this.map) {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
-          ++idx;
+          ++i;
+          j++;
           this.connection.pause();
           const obj = mapOne(row, this.map);
           const data = this.formatter.format(obj);
           this.writer.write(data);
           this.connection.resume();
+          if (j >= this.progressSize) {
+            if (this.logInfo) {
+              this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
+            }
+            j = 0;
+          }
         }));
       }
       else {
         reader.on("result", (row) => __awaiter(this, void 0, void 0, function* () {
-          ++idx;
+          ++i;
+          j++;
           this.connection.pause();
           const data = this.formatter.format(row);
           this.writer.write(data);
           this.connection.resume();
+          if (j >= this.progressSize) {
+            if (this.logInfo) {
+              this.logInfo(`Progress: ${i} records processed of file '${this.filename}'`);
+            }
+            j = 0;
+          }
         }));
       }
       return new Promise((resolve, reject) => {
@@ -1427,7 +1191,7 @@ export class ExportService {
                 reject(err);
               }
               else {
-                resolve(idx);
+                resolve(i);
               }
             });
           }