mysql2-core 0.2.0 → 0.2.2

package/lib/index.js

@@ -63,10 +63,52 @@ function createPool(conf) {
   if (conf.max && conf.max > 0 && !conf.connectionLimit) {
     conf.connectionLimit = conf.max;
   }
-  var pool = mysql2_1.createPool(__assign(__assign({}, conf), { rowsAsArray: true, multipleStatements: true }));
+  var pool = mysql2_1.createPool(__assign(__assign({}, conf), { rowsAsArray: true }));
   return pool;
 }
 exports.createPool = createPool;
+var PoolManager = (function () {
+  function PoolManager(pool) {
+    this.pool = pool;
+    this.driver = 'mysql';
+    this.param = this.param.bind(this);
+    this.exec = this.exec.bind(this);
+    this.execBatch = this.execBatch.bind(this);
+    this.query = this.query.bind(this);
+    this.queryOne = this.queryOne.bind(this);
+    this.execScalar = this.execScalar.bind(this);
+    this.count = this.count.bind(this);
+  }
+  PoolManager.prototype.param = function (i) {
+    return '?';
+  };
+  PoolManager.prototype.exec = function (sql, args, ctx) {
+    var p = (ctx ? ctx : this.pool);
+    return exec(p, sql, args);
+  };
+  PoolManager.prototype.execBatch = function (statements, firstSuccess, ctx) {
+    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);
+    return query(p, sql, args, m, bools);
+  };
+  PoolManager.prototype.queryOne = function (sql, args, m, bools, ctx) {
+    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);
+    return execScalar(p, sql, args);
+  };
+  PoolManager.prototype.count = function (sql, args, ctx) {
+    var p = (ctx ? ctx : this.pool);
+    return count(p, sql, args);
+  };
+  return PoolManager;
+}());
+exports.PoolManager = PoolManager;
 function execBatch(pool, statements, firstSuccess) {
   if (!statements || statements.length === 0) {
     return Promise.resolve(0);
@@ -228,7 +270,12 @@ function query(pool, sql, args, m, bools) {
           else {
             if (results.length > 0) {
               var arrayResult = results.map(function (item) {
-                return formatData(fields, item);
+                if (Array.isArray(item)) {
+                  return formatData(fields, item);
+                }
+                else {
+                  return item;
+                }
               });
               return resolve(handleResults(arrayResult, m, bools));
             }

package/package.json

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

package/src/index.ts

@@ -1,5 +1,5 @@
-import { Connection, createPool as createPool2, FieldPacket, format, OkPacket, Pool, PoolConnection, ResultSetHeader, RowDataPacket, } from 'mysql2';
-import { buildToSave, buildToSaveBatch, Metadata } from './build';
+import { Connection, createPool as createPool2, FieldPacket, format, OkPacket, Pool, PoolConnection, ResultSetHeader } from 'mysql2';
+import { buildToSave, buildToSaveBatch } from './build';
 import { Attribute, Attributes, Manager, Statement, StringMap } from './metadata';
 
 export * from './metadata';
@@ -25,11 +25,11 @@ export interface Config {
 export function createPool(conf: Config): Pool {
   if (conf.max && conf.max > 0 && !conf.connectionLimit) {
     conf.connectionLimit = conf.max;
-  } 
-  const pool = createPool2({...conf, rowsAsArray: true, multipleStatements: true});
+  }
+  const pool = createPool2({...conf, rowsAsArray: true});
   return pool;
 }
-/*
+
 // tslint:disable-next-line:max-classes-per-file
 export class PoolManager implements Manager {
   constructor(public pool: Pool) {
@@ -70,7 +70,6 @@ export class PoolManager implements Manager {
     return count(p, sql, args);
   }
 }
-*/
 export function execBatch(pool: Pool, statements: Statement[], firstSuccess?: boolean): Promise<number> {
   if (!statements || statements.length === 0) {
     return Promise.resolve(0);
@@ -127,7 +126,7 @@ export function execBatch(pool: Pool, statements: Statement[], firstSuccess?: bo
                         }
                       });
                       let c = 0;
-                      c += results0.affectedRows + results.reduce((prev,item) => prev + item.affectedRows, 0);
+                      c += results0.affectedRows + results.reduce((prev, item) => prev + item.affectedRows, 0);
                       return resolve(c);
                     }
                   });
@@ -172,7 +171,7 @@ export function execBatch(pool: Pool, statements: Statement[], firstSuccess?: bo
                     });
                   }
                 });
-                return resolve(results.reduce((prev,item) => prev + item.affectedRows, 0));
+                return resolve(results.reduce((prev, item) => prev + item.affectedRows, 0));
               }
             });
           }
@@ -208,13 +207,17 @@ export async function query<T>(pool: Pool | PoolConnection, sql: string, args?:
       if (err) {
         return reject(err);
       } else {
-        if(results.length > 0) {
+        if (results.length > 0) {
           const arrayResult = results.map(item => {
-            return formatData<T>(fields, item);
+            if(Array.isArray(item)) {
+              return formatData<T>(fields, item);
+            } else {
+              return item
+            }
           });
           return resolve(handleResults(arrayResult, m, bools));
         } else {
-          resolve([])
+          resolve([]);
         }
       }
     });