mysql2-core 0.2.3 → 0.2.4

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 var __assign = (this && this.__assign) || function () {
-  __assign = Object.assign || function (t) {
+  __assign = Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
       s = arguments[i];
       for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
@@ -20,8 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
   });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-  var _ = { label: 0, sent: function () { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
+  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
   function verb(n) { return function (v) { return step([n, v]); }; }
   function step(op) {
     if (f) throw new TypeError("Generator is already executing.");
@@ -70,7 +70,7 @@ exports.createPool = createPool;
 var PoolManager = (function () {
   function PoolManager(pool) {
     this.pool = pool;
-    this.driver = 'mysql';
+    this.driver = "mysql";
     this.param = this.param.bind(this);
     this.exec = this.exec.bind(this);
     this.execBatch = this.execBatch.bind(this);
@@ -80,30 +80,30 @@ var PoolManager = (function () {
     this.count = this.count.bind(this);
   }
   PoolManager.prototype.param = function (i) {
-    return '?';
+    return "?";
   };
   PoolManager.prototype.exec = function (sql, args, ctx) {
-    var p = (ctx ? ctx : this.pool);
+    var p = ctx ? ctx : this.pool;
     return exec(p, sql, args);
   };
   PoolManager.prototype.execBatch = function (statements, firstSuccess, ctx) {
-    var p = (ctx ? ctx : this.pool);
+    var p = ctx ? ctx : this.pool;
     return execBatch(p, statements, firstSuccess);
   };
   PoolManager.prototype.query = function (sql, args, m, bools, ctx) {
-    var p = (ctx ? ctx : this.pool);
+    var p = ctx ? ctx : this.pool;
     return query(p, sql, args, m, bools);
   };
   PoolManager.prototype.queryOne = function (sql, args, m, bools, ctx) {
-    var p = (ctx ? ctx : this.pool);
+    var p = ctx ? ctx : this.pool;
     return queryOne(p, sql, args, m, bools);
   };
   PoolManager.prototype.execScalar = function (sql, args, ctx) {
-    var p = (ctx ? ctx : this.pool);
+    var p = ctx ? ctx : this.pool;
     return execScalar(p, sql, args);
   };
   PoolManager.prototype.count = function (sql, args, ctx) {
-    var p = (ctx ? ctx : this.pool);
+    var p = ctx ? ctx : this.pool;
     return count(p, sql, args);
   };
   return PoolManager;
@@ -129,7 +129,7 @@ function execBatch(pool, statements, firstSuccess) {
             });
           }
           else {
-            var query0 = '';
+            var query0 = "";
             var queries_1 = [];
             var l = statements.length;
             for (var j = 0; j < l; j++) {
@@ -138,15 +138,15 @@ function execBatch(pool, statements, firstSuccess) {
                 query0 = mysql2_1.format(item.query, toArray(item.params));
               }
               else {
-                if (item.query.endsWith(';')) {
+                if (item.query.endsWith(";")) {
                   queries_1.push(mysql2_1.format(item.query, toArray(item.params)));
                 }
                 else {
-                  queries_1.push(mysql2_1.format(item.query + ';', toArray(item.params)));
+                  queries_1.push(mysql2_1.format(item.query + ";", toArray(item.params)));
                 }
               }
             }
-            connection.query(query0, function (er2a, results0) {
+            connection.execute(query0, function (er2a, results0) {
               if (er2a) {
                 connection.rollback(function () {
                   return reject(er2a);
@@ -157,7 +157,7 @@ function execBatch(pool, statements, firstSuccess) {
                   return 0;
                 }
                 else {
-                  connection.query(queries_1.join(''), function (er2, results) {
+                  connection.execute(queries_1.join(""), function (er2, results) {
                     if (er2) {
                       connection.rollback(function () {
                         return reject(er2);
@@ -172,7 +172,7 @@ function execBatch(pool, statements, firstSuccess) {
                         }
                       });
                       var c = 0;
-                      c += results0.affectedRows + results.reduce(function (prev, item) { return prev + item.affectedRows; }, 0);
+                      c += results0.affectedRows + results.affectedRows;
                       return resolve(c);
                     }
                   });
@@ -199,14 +199,14 @@ function execBatch(pool, statements, firstSuccess) {
           else {
             var queries_2 = [];
             statements.forEach(function (item) {
-              if (item.query.endsWith(';')) {
+              if (item.query.endsWith(";")) {
                 queries_2.push(mysql2_1.format(item.query, toArray(item.params)));
               }
               else {
-                queries_2.push(mysql2_1.format(item.query + ';', toArray(item.params)));
+                queries_2.push(mysql2_1.format(item.query + ";", toArray(item.params)));
               }
             });
-            connection.query(queries_2.join(''), function (er2, results) {
+            connection.execute(queries_2.join(""), function (er2, results) {
               if (er2) {
                 connection.rollback(function () {
                   buildError(er2);
@@ -221,7 +221,7 @@ function execBatch(pool, statements, firstSuccess) {
                     });
                   }
                 });
-                return resolve(results.reduce(function (prev, item) { return prev + item.affectedRows; }, 0));
+                return resolve(results.affectedRows);
               }
             });
           }
@@ -232,8 +232,8 @@ function execBatch(pool, statements, firstSuccess) {
 }
 exports.execBatch = execBatch;
 function buildError(err) {
-  if (err.errno === 1062 && err.code === 'ER_DUP_ENTRY') {
-    err.error = 'duplicate';
+  if (err.errno === 1062 && err.code === "ER_DUP_ENTRY") {
+    err.error = "duplicate";
   }
   return err;
 }
@@ -243,16 +243,16 @@ function exec(pool, sql, args) {
     return __generator(this, function (_a) {
       p = toArray(args);
       return [2, new Promise(function (resolve, reject) {
-        return pool.execute(sql, p, function (err, res) {
-          if (err) {
-            buildError(err);
-            return reject(err);
-          }
-          else {
-            return resolve(res.affectedRows);
-          }
-        });
-      })];
+          return pool.execute(sql, p, function (err, res) {
+            if (err) {
+              buildError(err);
+              return reject(err);
+            }
+            else {
+              return resolve(res.affectedRows);
+            }
+          });
+        })];
     });
   });
 }
@@ -263,35 +263,35 @@ function query(pool, sql, args, m, bools) {
     return __generator(this, function (_a) {
       p = toArray(args);
       return [2, new Promise(function (resolve, reject) {
-        return pool.query(sql, p, function (err, results, fields) {
-          if (err) {
-            return reject(err);
-          }
-          else {
-            if (results.length > 0) {
-              var arrayResult = results.map(function (item) {
-                if (Array.isArray(item)) {
-                  return formatData(fields, item);
-                }
-                else {
-                  return item;
-                }
-              });
-              return resolve(handleResults(arrayResult, m, bools));
+          return pool.query(sql, p, function (err, results, fields) {
+            if (err) {
+              return reject(err);
             }
             else {
-              resolve([]);
+              if (results.length > 0) {
+                var arrayResult = results.map(function (item) {
+                  if (Array.isArray(item)) {
+                    return formatData(fields, item);
+                  }
+                  else {
+                    return item;
+                  }
+                });
+                return resolve(handleResults(arrayResult, m, bools));
+              }
+              else {
+                resolve([]);
+              }
             }
-          }
-        });
-      })];
+          });
+        })];
     });
   });
 }
 exports.query = query;
 function queryOne(pool, sql, args, m, bools) {
   return query(pool, sql, args, m, bools).then(function (r) {
-    return (r && r.length > 0 ? r[0] : null);
+    return r && r.length > 0 ? r[0] : null;
   });
 }
 exports.queryOne = queryOne;
@@ -316,7 +316,7 @@ function save(pool, obj, table, attrs, ver, buildParam, i) {
   if (!s) {
     return Promise.resolve(-1);
   }
-  if (typeof pool === 'function') {
+  if (typeof pool === "function") {
     return pool(s.query, s.params);
   }
   else {
@@ -326,7 +326,7 @@ function save(pool, obj, table, attrs, ver, buildParam, i) {
 exports.save = save;
 function saveBatch(pool, objs, table, attrs, ver, buildParam) {
   var s = build_1.buildToSaveBatch(objs, table, attrs, ver, buildParam);
-  if (typeof pool === 'function') {
+  if (typeof pool === "function") {
     return pool(s);
   }
   else {
@@ -345,7 +345,7 @@ function toArray(arr) {
       p.push(null);
     }
     else {
-      if (typeof arr[i] === 'object') {
+      if (typeof arr[i] === "object") {
         if (arr[i] instanceof Date) {
           p.push(arr[i]);
         }
@@ -398,13 +398,13 @@ function handleBool(objs, bools) {
       var field = bools_1[_a];
       if (field.name) {
         var v = o[field.name];
-        if (typeof v !== 'boolean' && v != null && v !== undefined) {
+        if (typeof v !== "boolean" && v != null && v !== undefined) {
           var b = field.true;
           if (b == null || b === undefined) {
-            o[field.name] = ('1' == v || 'T' == v || 'Y' == v || 'true' == v || 'on' == v);
+            o[field.name] = "1" == v || "T" == v || "Y" == v || "true" == v || "on" == v;
           }
           else {
-            o[field.name] = (v == b ? true : false);
+            o[field.name] = v == b ? true : false;
           }
         }
       }
@@ -500,10 +500,10 @@ exports.getFields = getFields;
 function buildFields(fields, all) {
   var s = getFields(fields, all);
   if (!s || s.length === 0) {
-    return '*';
+    return "*";
   }
   else {
-    return s.join(',');
+    return s.join(",");
   }
 }
 exports.buildFields = buildFields;
@@ -515,7 +515,7 @@ function getMapField(name, mp) {
   if (!x) {
     return name;
   }
-  if (typeof x === 'string') {
+  if (typeof x === "string") {
     return x;
   }
   return name;
@@ -536,7 +536,7 @@ var StringService = (function () {
   StringService.prototype.load = function (key, max) {
     var _this = this;
     var s = "select " + this.column + " from " + this.table + " where " + this.column + " like ? order by " + this.column + " limit " + max;
-    return query(this.pool, s, ['' + key + '%']).then(function (arr) {
+    return query(this.pool, s, ["" + key + "%"]).then(function (arr) {
       return arr.map(function (i) { return i[_this.column]; });
     });
   };
@@ -546,9 +546,9 @@ var StringService = (function () {
     }
     var arr = [];
     for (var i = 1; i <= values.length; i++) {
-      arr.push('(?)');
+      arr.push("(?)");
     }
-    var s = "insert ignore into " + this.table + "(" + this.column + ")values" + arr.join(',');
+    var s = "insert ignore into " + this.table + "(" + this.column + ")values" + arr.join(",");
     return exec(this.pool, s, values);
   };
   return StringService;
@@ -573,7 +573,7 @@ var MySQLWriter = (function () {
     this.attributes = attributes;
     this.oneIfSuccess = oneIfSuccess;
     this.write = this.write.bind(this);
-    if (typeof pool === 'function') {
+    if (typeof pool === "function") {
       this.exec = pool;
     }
     else {
@@ -598,7 +598,7 @@ var MySQLWriter = (function () {
     if (stmt) {
       if (this.exec) {
         if (this.oneIfSuccess) {
-          return this.exec(stmt.query, stmt.params).then(function (ct) { return ct > 0 ? 1 : 0; });
+          return this.exec(stmt.query, stmt.params).then(function (ct) { return (ct > 0 ? 1 : 0); });
         }
         else {
           return this.exec(stmt.query, stmt.params);
@@ -606,7 +606,7 @@ var MySQLWriter = (function () {
       }
       else {
         if (this.oneIfSuccess) {
-          return exec(this.pool, stmt.query, stmt.params).then(function (ct) { return ct > 0 ? 1 : 0; });
+          return exec(this.pool, stmt.query, stmt.params).then(function (ct) { return (ct > 0 ? 1 : 0); });
         }
         else {
           return exec(this.pool, stmt.query, stmt.params);
@@ -628,7 +628,7 @@ var MySQLStreamWriter = (function () {
     this.size = 0;
     this.write = this.write.bind(this);
     this.flush = this.flush.bind(this);
-    if (typeof pool === 'function') {
+    if (typeof pool === "function") {
       this.execBatch = pool;
     }
     else {
@@ -699,7 +699,7 @@ var MySQLBatchWriter = (function () {
     this.attributes = attributes;
     this.oneIfSuccess = oneIfSuccess;
     this.write = this.write.bind(this);
-    if (typeof pool === 'function') {
+    if (typeof pool === "function") {
       this.execute = pool;
     }
     else {
@@ -754,8 +754,8 @@ exports.MySQLBatchWriter = MySQLBatchWriter;
 var MySQLChecker = (function () {
   function MySQLChecker(pool, service, timeout) {
     this.pool = pool;
-    this.timeout = (timeout ? timeout : 4200);
-    this.service = (service ? service : 'mysql');
+    this.timeout = timeout ? timeout : 4200;
+    this.service = service ? service : "mysql";
     this.check = this.check.bind(this);
     this.name = this.name.bind(this);
     this.build = this.build.bind(this);
@@ -767,7 +767,7 @@ var MySQLChecker = (function () {
       return __generator(this, function (_a) {
         obj = {};
         promise = new Promise(function (resolve, reject) {
-          _this.pool.query('select current_time', function (err, result) {
+          _this.pool.query("select current_time", function (err, result) {
             if (err) {
               return reject(err);
             }
@@ -794,7 +794,7 @@ var MySQLChecker = (function () {
       if (!data) {
         data = {};
       }
-      data['error'] = err;
+      data["error"] = err;
     }
     return data;
   };
@@ -808,7 +808,7 @@ function promiseTimeOut(timeoutInMilliseconds, promise) {
       setTimeout(function () {
         reject("Timed out in: " + timeoutInMilliseconds + " milliseconds!");
       }, timeoutInMilliseconds);
-    })
+    }),
   ]);
 }
 var Exporter = (function () {
@@ -836,56 +836,52 @@ var Exporter = (function () {
           case 1:
             stmt = _a.sent();
             reader = this.connection.query(stmt.query, stmt.params);
-            reader.on('error', function (err) { return er = err; });
+            reader.on("error", function (err) { return (er = err); });
             if (this.map) {
-              reader.on('result', function (row) {
-                return __awaiter(_this, void 0, void 0, function () {
-                  var obj, data;
-                  return __generator(this, function (_a) {
-                    ++idx;
-                    this.connection.pause();
-                    obj = mapOne(row, this.map);
-                    data = this.format(obj);
-                    this.write(data);
-                    this.connection.resume();
-                    return [2];
-                  });
+              reader.on("result", function (row) { return __awaiter(_this, void 0, void 0, function () {
+                var obj, data;
+                return __generator(this, function (_a) {
+                  ++idx;
+                  this.connection.pause();
+                  obj = mapOne(row, this.map);
+                  data = this.format(obj);
+                  this.write(data);
+                  this.connection.resume();
+                  return [2];
                 });
-              });
+              }); });
             }
             else {
-              reader.on('result', function (row) {
-                return __awaiter(_this, void 0, void 0, function () {
-                  var data;
-                  return __generator(this, function (_a) {
-                    ++idx;
-                    this.connection.pause();
-                    data = this.format(row);
-                    this.write(data);
-                    this.connection.resume();
-                    return [2];
-                  });
+              reader.on("result", function (row) { return __awaiter(_this, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_a) {
+                  ++idx;
+                  this.connection.pause();
+                  data = this.format(row);
+                  this.write(data);
+                  this.connection.resume();
+                  return [2];
                 });
-              });
+              }); });
             }
             return [2, new Promise(function (resolve, reject) {
-              reader.on('end', function () {
-                _this.end();
-                if (er) {
-                  reject(er);
-                }
-                else {
-                  _this.connection.end(function (err) {
-                    if (err) {
-                      reject(err);
-                    }
-                    else {
-                      resolve(idx);
-                    }
-                  });
-                }
-              });
-            })];
+                reader.on("end", function () {
+                  _this.end();
+                  if (er) {
+                    reject(er);
+                  }
+                  else {
+                    _this.connection.end(function (err) {
+                      if (err) {
+                        reject(err);
+                      }
+                      else {
+                        resolve(idx);
+                      }
+                    });
+                  }
+                });
+              })];
         }
       });
     });
@@ -917,61 +913,57 @@ var ExportService = (function () {
           case 1:
             stmt = _a.sent();
             reader = this.connection.query(stmt.query, stmt.params);
-            reader.on('error', function (err) { return er = err; });
+            reader.on("error", function (err) { return (er = err); });
             if (this.map) {
-              reader.on('result', function (row) {
-                return __awaiter(_this, void 0, void 0, function () {
-                  var obj, data;
-                  return __generator(this, function (_a) {
-                    ++idx;
-                    this.connection.pause();
-                    obj = mapOne(row, this.map);
-                    data = this.formatter.format(obj);
-                    this.writer.write(data);
-                    this.connection.resume();
-                    return [2];
-                  });
+              reader.on("result", function (row) { return __awaiter(_this, void 0, void 0, function () {
+                var obj, data;
+                return __generator(this, function (_a) {
+                  ++idx;
+                  this.connection.pause();
+                  obj = mapOne(row, this.map);
+                  data = this.formatter.format(obj);
+                  this.writer.write(data);
+                  this.connection.resume();
+                  return [2];
                 });
-              });
+              }); });
             }
             else {
-              reader.on('result', function (row) {
-                return __awaiter(_this, void 0, void 0, function () {
-                  var data;
-                  return __generator(this, function (_a) {
-                    ++idx;
-                    this.connection.pause();
-                    data = this.formatter.format(row);
-                    this.writer.write(data);
-                    this.connection.resume();
-                    return [2];
-                  });
+              reader.on("result", function (row) { return __awaiter(_this, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_a) {
+                  ++idx;
+                  this.connection.pause();
+                  data = this.formatter.format(row);
+                  this.writer.write(data);
+                  this.connection.resume();
+                  return [2];
                 });
-              });
+              }); });
             }
             return [2, new Promise(function (resolve, reject) {
-              reader.on('end', function () {
-                if (_this.writer.end) {
-                  _this.writer.end();
-                }
-                else if (_this.writer.flush) {
-                  _this.writer.flush();
-                }
-                if (er) {
-                  reject(er);
-                }
-                else {
-                  _this.connection.end(function (err) {
-                    if (err) {
-                      reject(err);
-                    }
-                    else {
-                      resolve(idx);
-                    }
-                  });
-                }
-              });
-            })];
+                reader.on("end", function () {
+                  if (_this.writer.end) {
+                    _this.writer.end();
+                  }
+                  else if (_this.writer.flush) {
+                    _this.writer.flush();
+                  }
+                  if (er) {
+                    reject(er);
+                  }
+                  else {
+                    _this.connection.end(function (err) {
+                      if (err) {
+                        reject(err);
+                      }
+                      else {
+                        resolve(idx);
+                      }
+                    });
+                  }
+                });
+              })];
         }
       });
     });
@@ -996,7 +988,7 @@ function mapOne(results, m) {
     if (!k0) {
       k0 = key;
     }
-    obj2[k0] = (obj)[key];
+    obj2[k0] = obj[key];
   }
   return obj2;
 }
@@ -1009,7 +1001,7 @@ function buildMap(attrs) {
     var k = ks_2[_i];
     var attr = attrs[k];
     attr.name = k;
-    var field = (attr.column ? attr.column : k);
+    var field = attr.column ? attr.column : k;
     var s = field.toLowerCase();
     if (s !== k) {
       mp[s] = k;
@@ -1029,9 +1021,9 @@ function select(table, attrs) {
     var k = ks_3[_i];
     var attr = attrs[k];
     attr.name = k;
-    var field = (attr.column ? attr.column : k);
+    var field = attr.column ? attr.column : k;
     cols.push(field);
   }
-  return "select " + cols.join(',') + " from " + table;
+  return "select " + cols.join(",") + " from " + table;
 }
 exports.select = select;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql2-core",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "mysql2-core",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
@@ -9,6 +9,7 @@
     "clean:lib": "rimraf lib"
   },
   "devDependencies": {
+    "mysql2": "^3.16.3",
     "tslint": "5.10.0",
     "typescript": "^3.3.3333"
   },