query-core 0.6.0 → 0.6.2

package/lib/batch.js

@@ -24,7 +24,7 @@ var SqlInserter = (function () {
       obj2 = this.map(obj);
     }
     var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
-    if (stmt.query.length > 0) {
+    if (stmt.query.length) {
       if (this.oneIfSuccess) {
         return this.exec(stmt.query, stmt.params).then(function (ct) { return (ct > 0 ? 1 : 0); });
       }
@@ -62,7 +62,7 @@ var SqlUpdater = (function () {
       obj2 = this.map(obj);
     }
     var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
-    if (stmt.query.length > 0) {
+    if (stmt.query.length) {
       if (this.oneIfSuccess) {
         return this.exec(stmt.query, stmt.params).then(function (ct) { return (ct > 0 ? 1 : 0); });
       }
@@ -105,7 +105,7 @@ var SqlBatchInserter = (function () {
       }
     }
     var stmt = build_1.buildToInsertBatch(list, this.table, this.attributes, this.param, this.version);
-    if (stmt.query.length > 0) {
+    if (stmt.query.length) {
       if (this.oneIfSuccess) {
         return this.exec(stmt.query, stmt.params).then(function (ct) { return objs.length; });
       }
@@ -210,7 +210,7 @@ var StreamInserter = (function () {
     else {
       var total_1 = this.list.length;
       var stmt = build_1.buildToInsertBatch(this.list, this.table, this.attributes, this.param, this.version);
-      if (stmt.query.length > 0) {
+      if (stmt.query.length) {
         return this.exec(stmt.query, stmt.params).then(function (r) {
           _this.list = [];
           return total_1;

package/lib/build.js

@@ -124,7 +124,7 @@ function buildToDelete(obj, table, ks, buildParam, i) {
 exports.buildToDelete = buildToDelete;
 function insert(exec, obj, table, attrs, buildParam, ver, i) {
   var stm = buildToInsert(obj, table, attrs, buildParam, ver, i);
-  if (stm.query.length === 0) {
+  if (!stm.query) {
     return Promise.resolve(0);
   }
   else {
@@ -217,7 +217,7 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
 exports.buildToInsert = buildToInsert;
 function insertBatch(exec, objs, table, attrs, buildParam, ver, i) {
   var stm = buildToInsertBatch(objs, table, attrs, buildParam, ver, i);
-  if (stm.query.length === 0) {
+  if (!stm.query) {
     return Promise.resolve(0);
   }
   else {
@@ -397,7 +397,7 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
 exports.buildToInsertBatch = buildToInsertBatch;
 function update(exec, obj, table, attrs, buildParam, ver, i) {
   var stm = buildToUpdate(obj, table, attrs, buildParam, ver, i);
-  if (stm.query.length === 0) {
+  if (!stm.query) {
     return Promise.resolve(0);
   }
   else {

package/lib/client.js

@@ -105,7 +105,7 @@ var ProxyClient = (function () {
   };
   ProxyClient.prototype.insert = function (table, attrs, obj, buildParam, ver) {
     var s = build_1.buildToInsert(obj, table, attrs, buildParam, ver);
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.exec(s.query, s.params);
     }
     else {
@@ -114,7 +114,7 @@ var ProxyClient = (function () {
   };
   ProxyClient.prototype.update = function (table, attrs, obj, buildParam, ver) {
     var s = build_1.buildToUpdate(obj, table, attrs, buildParam, ver);
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.exec(s.query, s.params);
     }
     else {
@@ -123,7 +123,7 @@ var ProxyClient = (function () {
   };
   ProxyClient.prototype.insertBatch = function (table, attrs, objs, buildParam, driver) {
     var s = build_1.buildToInsertBatch(objs, table, attrs, buildParam);
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.exec(s.query, s.params);
     }
     else {
@@ -141,7 +141,7 @@ var ProxyClient = (function () {
   };
   ProxyClient.prototype.insertWithTx = function (tx, commit, table, attrs, obj, buildParam, ver) {
     var s = build_1.buildToInsert(obj, table, attrs, buildParam, ver);
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.execWithTx(tx, commit, s.query, s.params);
     }
     else {
@@ -150,7 +150,7 @@ var ProxyClient = (function () {
   };
   ProxyClient.prototype.updateWithTx = function (tx, commit, table, attrs, obj, buildParam, ver) {
     var s = build_1.buildToUpdate(obj, table, attrs, buildParam, ver);
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.execWithTx(tx, commit, s.query, s.params);
     }
     else {
@@ -159,7 +159,7 @@ var ProxyClient = (function () {
   };
   ProxyClient.prototype.insertBatchWithTx = function (tx, commit, table, attrs, objs, buildParam, driver) {
     var s = build_1.buildToInsertBatch(objs, table, attrs, buildParam);
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.execWithTx(tx, commit, s.query, s.params);
     }
     else {

package/lib/index.js

@@ -25,11 +25,11 @@ __export(require("./search"));
 __export(require("./SearchBuilder"));
 __export(require("./services"));
 var Loader = (function () {
-  function Loader(query, sql, m, bools) {
+  function Loader(query, sql, map, bools) {
     this.query = query;
     this.sql = sql;
+    this.map = map;
     this.bools = bools;
-    this.map = m;
     this.load = this.load.bind(this);
   }
   Loader.prototype.load = function () {

package/lib/services.js

@@ -15,17 +15,17 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
 var SearchBuilder_1 = require("./SearchBuilder");
-function useGet(q, table, attrs, param, fromDB) {
-  var l = new SqlLoader(q, table, attrs, param, fromDB);
+function useGet(q, param, table, attrs, fromDB) {
+  var l = new SqlLoader(q, param, table, attrs, fromDB);
   return l.load;
 }
 exports.useGet = useGet;
 exports.useLoad = useGet;
 var SqlLoader = (function () {
-  function SqlLoader(query, table, attrs, param, fromDB) {
+  function SqlLoader(query, param, table, attrs, fromDB) {
     this.query = query;
-    this.table = table;
     this.param = param;
+    this.table = table;
     this.fromDB = fromDB;
     if (Array.isArray(attrs)) {
       this.primaryKeys = build_1.attributes(attrs);
@@ -48,18 +48,18 @@ var SqlLoader = (function () {
   SqlLoader.prototype.metadata = function () {
     return this.attributes;
   };
-  SqlLoader.prototype.all = function () {
+  SqlLoader.prototype.all = function (ctx) {
     var sql = "select * from " + this.table;
-    return this.query(sql, [], this.map);
+    return this.query(sql, [], this.map, this.bools, ctx);
   };
   SqlLoader.prototype.load = function (id, ctx) {
     var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
-    if (!stmt) {
+    if (!stmt.query) {
       throw new Error("cannot build query by id");
     }
     var fn = this.fromDB;
     if (fn) {
-      return this.query(stmt.query, stmt.params, this.map, ctx).then(function (res) {
+      return this.query(stmt.query, stmt.params, this.map, this.bools, ctx).then(function (res) {
         if (!res || res.length === 0) {
           return null;
         }
@@ -70,16 +70,16 @@ var SqlLoader = (function () {
       });
     }
     else {
-      return this.query(stmt.query, stmt.params, this.map).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
+      return this.query(stmt.query, stmt.params, this.map, this.bools, ctx).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
     }
   };
   SqlLoader.prototype.exist = function (id, ctx) {
     var field = this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name;
     var stmt = build_1.exist(id, this.table, this.primaryKeys, this.param, field);
-    if (!stmt) {
+    if (!stmt.query) {
       throw new Error("cannot build query by id");
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
+    return this.query(stmt.query, stmt.params, undefined, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
   };
   return SqlLoader;
 }());
@@ -96,7 +96,7 @@ var QueryRepository = (function () {
     this.map = m.map;
     this.bools = m.bools;
   }
-  QueryRepository.prototype.query = function (ids) {
+  QueryRepository.prototype.query = function (ids, ctx) {
     if (!ids || ids.length === 0) {
       return Promise.resolve([]);
     }
@@ -109,7 +109,8 @@ var QueryRepository = (function () {
     if (this.sort && this.sort.length > 0) {
       sql = sql + " order by " + this.sort;
     }
-    return this.db.query(sql, ids, this.map, this.bools);
+    var db = ctx ? ctx : this.db;
+    return db.query(sql, ids, this.map, this.bools);
   };
   return QueryRepository;
 }());
@@ -407,9 +408,8 @@ function diff(d1) {
 }
 exports.diff = diff;
 var SqlWriter = (function () {
-  function SqlWriter(exec, param, table, attributes, toDB) {
-    this.exec = exec;
-    this.param = param;
+  function SqlWriter(db, table, attributes, toDB) {
+    this.db = db;
     this.table = table;
     this.attributes = attributes;
     this.toDB = toDB;
@@ -426,9 +426,10 @@ var SqlWriter = (function () {
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
-    var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx).catch(function (err) {
+    var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.db.param, this.version);
+    if (stmt.query) {
+      var db = ctx ? ctx : this.db;
+      return db.exec(stmt.query, stmt.params).catch(function (err) {
         if (err && err.error === "duplicate") {
           return 0;
         }
@@ -438,7 +439,7 @@ var SqlWriter = (function () {
       });
     }
     else {
-      return Promise.resolve(0);
+      return Promise.resolve(-1);
     }
   };
   SqlWriter.prototype.update = function (obj, ctx) {
@@ -446,12 +447,13 @@ var SqlWriter = (function () {
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
-    var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx);
+    var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.db.param, this.version);
+    if (stmt.query) {
+      var db = ctx ? ctx : this.db;
+      return db.exec(stmt.query, stmt.params);
     }
     else {
-      return Promise.resolve(0);
+      return Promise.resolve(-1);
     }
   };
   SqlWriter.prototype.patch = function (obj, ctx) {
@@ -463,9 +465,8 @@ exports.SqlWriter = SqlWriter;
 var CRUDRepository = (function (_super) {
   __extends(CRUDRepository, _super);
   function CRUDRepository(db, table, attributes, toDB, fromDB) {
-    var _this = _super.call(this, db.exec, db.param, table, attributes, toDB) || this;
+    var _this = _super.call(this, db, table, attributes, toDB) || this;
     _this.fromDB = fromDB;
-    _this.query = db.query;
     var m = build_1.metadata(attributes);
     _this.primaryKeys = m.keys;
     _this.map = m.map;
@@ -480,18 +481,20 @@ var CRUDRepository = (function (_super) {
   CRUDRepository.prototype.metadata = function () {
     return this.attributes;
   };
-  CRUDRepository.prototype.all = function () {
+  CRUDRepository.prototype.all = function (ctx) {
     var sql = "select * from " + this.table;
-    return this.query(sql, [], this.map);
+    var db = ctx ? ctx : this.db;
+    return db.query(sql, [], this.map, this.bools);
   };
   CRUDRepository.prototype.load = function (id, ctx) {
-    var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
-    if (stmt.query.length === 0) {
+    var stmt = build_1.select(id, this.table, this.primaryKeys, this.db.param);
+    if (!stmt.query) {
       throw new Error("cannot build query by id");
     }
     var fn = this.fromDB;
+    var db = ctx ? ctx : this.db;
     if (fn) {
-      return this.query(stmt.query, stmt.params, this.map, ctx).then(function (res) {
+      return db.query(stmt.query, stmt.params, this.map, this.bools).then(function (res) {
         if (!res || res.length === 0) {
           return null;
         }
@@ -502,24 +505,26 @@ var CRUDRepository = (function (_super) {
       });
     }
     else {
-      return this.query(stmt.query, stmt.params, this.map).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
+      return db.query(stmt.query, stmt.params, this.map, this.bools).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
     }
   };
   CRUDRepository.prototype.exist = function (id, ctx) {
     var field = this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name;
-    var stmt = build_1.exist(id, this.table, this.primaryKeys, this.param, field);
-    if (stmt.query.length === 0) {
+    var stmt = build_1.exist(id, this.table, this.primaryKeys, this.db.param, field);
+    if (!stmt.query) {
       throw new Error("cannot build query by id");
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
+    var db = ctx ? ctx : this.db;
+    return db.query(stmt.query, stmt.params).then(function (res) { return (!res || res.length === 0 ? false : true); });
   };
   CRUDRepository.prototype.delete = function (id, ctx) {
-    var stmt = build_1.buildToDelete(id, this.table, this.primaryKeys, this.param);
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx);
+    var stmt = build_1.buildToDelete(id, this.table, this.primaryKeys, this.db.param);
+    if (stmt.query) {
+      var db = ctx ? ctx : this.db;
+      return db.exec(stmt.query, stmt.params);
     }
     else {
-      return Promise.resolve(0);
+      return Promise.resolve(-1);
     }
   };
   return CRUDRepository;
@@ -529,9 +534,9 @@ var SqlSearchWriter = (function (_super) {
   __extends(SqlSearchWriter, _super);
   function SqlSearchWriter(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
     var _this = _super.call(this, db.query, table, attributes, db.driver, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
+    _this.db = db;
     _this.attributes = attributes;
     _this.toDB = toDB;
-    _this.exec = db.exec;
     var x = build_1.version(attributes);
     if (x) {
       _this.version = x.name;
@@ -547,8 +552,9 @@ var SqlSearchWriter = (function (_super) {
       obj2 = this.toDB(obj);
     }
     var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx).catch(function (err) {
+    if (stmt.query) {
+      var db = ctx ? ctx : this.db;
+      return db.exec(stmt.query, stmt.params).catch(function (err) {
         if (err && err.error === "duplicate") {
           return 0;
         }
@@ -558,7 +564,7 @@ var SqlSearchWriter = (function (_super) {
       });
     }
     else {
-      return Promise.resolve(0);
+      return Promise.resolve(-1);
     }
   };
   SqlSearchWriter.prototype.update = function (obj, ctx) {
@@ -567,11 +573,12 @@ var SqlSearchWriter = (function (_super) {
       obj2 = this.toDB(obj);
     }
     var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx);
+    if (stmt.query) {
+      var db = ctx ? ctx : this.db;
+      return db.exec(stmt.query, stmt.params);
     }
     else {
-      return Promise.resolve(0);
+      return Promise.resolve(-1);
     }
   };
   SqlSearchWriter.prototype.patch = function (obj, ctx) {
@@ -596,9 +603,10 @@ var SqlRepository = (function (_super) {
   SqlRepository.prototype.metadata = function () {
     return this.attributes;
   };
-  SqlRepository.prototype.all = function () {
+  SqlRepository.prototype.all = function (ctx) {
     var sql = "select * from " + this.table;
-    return this.query(sql, [], this.map);
+    var db = ctx ? ctx : this.db;
+    return db.query(sql, [], this.map, this.bools);
   };
   SqlRepository.prototype.load = function (id, ctx) {
     var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
@@ -606,8 +614,9 @@ var SqlRepository = (function (_super) {
       throw new Error("cannot build query by id");
     }
     var fn = this.fromDB;
+    var db = ctx ? ctx : this.db;
     if (fn) {
-      return this.query(stmt.query, stmt.params, this.map, ctx).then(function (res) {
+      return db.query(stmt.query, stmt.params, this.map, this.bools).then(function (res) {
         if (!res || res.length === 0) {
           return null;
         }
@@ -618,7 +627,7 @@ var SqlRepository = (function (_super) {
       });
     }
     else {
-      return this.query(stmt.query, stmt.params, this.map).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
+      return db.query(stmt.query, stmt.params, this.map, this.bools).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
     }
   };
   SqlRepository.prototype.exist = function (id, ctx) {
@@ -627,15 +636,17 @@ var SqlRepository = (function (_super) {
     if (!stmt) {
       throw new Error("cannot build query by id");
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
+    var db = ctx ? ctx : this.db;
+    return db.query(stmt.query, stmt.params).then(function (res) { return (!res || res.length === 0 ? false : true); });
   };
   SqlRepository.prototype.delete = function (id, ctx) {
     var stmt = build_1.buildToDelete(id, this.table, this.primaryKeys, this.param);
-    if (stmt) {
-      return this.exec(stmt.query, stmt.params, ctx);
+    if (stmt.query) {
+      var db = ctx ? ctx : this.db;
+      return db.exec(stmt.query, stmt.params);
     }
     else {
-      return Promise.resolve(0);
+      return Promise.resolve(-1);
     }
   };
   return SqlRepository;
@@ -660,18 +671,18 @@ var Query = (function (_super) {
   Query.prototype.metadata = function () {
     return this.attrs;
   };
-  Query.prototype.all = function () {
+  Query.prototype.all = function (ctx) {
     var sql = "select * from " + this.table;
-    return this.query(sql, [], this.map);
+    return this.query(sql, [], this.map, this.bools, ctx);
   };
   Query.prototype.load = function (id, ctx) {
     var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
-    if (!stmt) {
+    if (!stmt.query) {
       throw new Error("cannot build query by id");
     }
     var fn = this.fromDB;
     if (fn) {
-      return this.query(stmt.query, stmt.params, this.map, ctx).then(function (res) {
+      return this.query(stmt.query, stmt.params, this.map, this.bools, ctx).then(function (res) {
         if (!res || res.length === 0) {
           return null;
         }
@@ -682,16 +693,16 @@ var Query = (function (_super) {
       });
     }
     else {
-      return this.query(stmt.query, stmt.params, this.map).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
+      return this.query(stmt.query, stmt.params, this.map, this.bools, ctx).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
     }
   };
   Query.prototype.exist = function (id, ctx) {
     var field = this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name;
     var stmt = build_1.exist(id, this.table, this.primaryKeys, this.param, field);
-    if (!stmt) {
+    if (stmt.query) {
       throw new Error("cannot build query by id");
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
+    return this.query(stmt.query, stmt.params, undefined, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
   };
   return Query;
 }(SearchBuilder_1.SearchBuilder));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-core",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/batch.ts

@@ -26,7 +26,7 @@ export class SqlInserter<T> {
       obj2 = this.map(obj)
     }
     const stmt = buildToInsert(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt.query.length > 0) {
+    if (stmt.query.length) {
       if (this.oneIfSuccess) {
         return this.exec(stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0))
       } else {
@@ -63,7 +63,7 @@ export class SqlUpdater<T> {
       obj2 = this.map(obj)
     }
     const stmt = buildToUpdate(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt.query.length > 0) {
+    if (stmt.query.length) {
       if (this.oneIfSuccess) {
         return this.exec(stmt.query, stmt.params).then((ct) => (ct > 0 ? 1 : 0))
       } else {
@@ -104,7 +104,7 @@ export class SqlBatchInserter<T> {
       }
     }
     const stmt = buildToInsertBatch(list, this.table, this.attributes, this.param, this.version)
-    if (stmt.query.length > 0) {
+    if (stmt.query.length) {
       if (this.oneIfSuccess) {
         return this.exec(stmt.query, stmt.params).then((ct) => objs.length)
       } else {
@@ -205,7 +205,7 @@ export class StreamInserter<T> {
     } else {
       const total = this.list.length
       const stmt = buildToInsertBatch(this.list, this.table, this.attributes, this.param, this.version)
-      if (stmt.query.length > 0) {
+      if (stmt.query.length) {
         return this.exec(stmt.query, stmt.params).then((r) => {
           this.list = []
           return total

package/src/build.ts

@@ -115,7 +115,7 @@ export function insert<T>(
   i?: number,
 ): Promise<number> {
   const stm = buildToInsert(obj, table, attrs, buildParam, ver, i)
-  if (stm.query.length === 0) {
+  if (!stm.query) {
     return Promise.resolve(0)
   } else {
     return exec(stm.query, stm.params)
@@ -203,7 +203,7 @@ export function insertBatch<T>(
   i?: number,
 ): Promise<number> {
   const stm = buildToInsertBatch(objs, table, attrs, buildParam, ver, i)
-  if (stm.query.length === 0) {
+  if (!stm.query) {
     return Promise.resolve(0)
   } else {
     return exec(stm.query, stm.params)
@@ -373,7 +373,7 @@ export function update<T>(
   i?: number,
 ): Promise<number> {
   const stm = buildToUpdate(obj, table, attrs, buildParam, ver, i)
-  if (stm.query.length === 0) {
+  if (!stm.query) {
     return Promise.resolve(0)
   } else {
     return exec(stm.query, stm.params)

package/src/client.ts

@@ -153,7 +153,7 @@ export class ProxyClient {
 
   insert<T>(table: string, attrs: Attributes, obj: T, buildParam: (i: number) => string, ver?: string): Promise<number> {
     const s = buildToInsert(obj, table, attrs, buildParam, ver)
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.exec(s.query, s.params)
     } else {
       return Promise.resolve(-1)
@@ -161,7 +161,7 @@ export class ProxyClient {
   }
   update<T>(table: string, attrs: Attributes, obj: T, buildParam: (i: number) => string, ver?: string): Promise<number> {
     const s = buildToUpdate(obj, table, attrs, buildParam, ver)
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.exec(s.query, s.params)
     } else {
       return Promise.resolve(-1)
@@ -169,7 +169,7 @@ export class ProxyClient {
   }
   insertBatch<T>(table: string, attrs: Attributes, objs: T[], buildParam: (i: number) => string, driver?: string): Promise<number> {
     const s = buildToInsertBatch(objs, table, attrs, buildParam)
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.exec(s.query, s.params)
     } else {
       return Promise.resolve(-1)
@@ -185,7 +185,7 @@ export class ProxyClient {
   }
   insertWithTx<T>(tx: string, commit: boolean, table: string, attrs: Attributes, obj: T, buildParam: (i: number) => string, ver?: string): Promise<number> {
     const s = buildToInsert(obj, table, attrs, buildParam, ver)
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.execWithTx(tx, commit, s.query, s.params)
     } else {
       return Promise.resolve(-1)
@@ -193,7 +193,7 @@ export class ProxyClient {
   }
   updateWithTx<T>(tx: string, commit: boolean, table: string, attrs: Attributes, obj: T, buildParam: (i: number) => string, ver?: string): Promise<number> {
     const s = buildToUpdate(obj, table, attrs, buildParam, ver)
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.execWithTx(tx, commit, s.query, s.params)
     } else {
       return Promise.resolve(-1)
@@ -209,7 +209,7 @@ export class ProxyClient {
     driver?: string,
   ): Promise<number> {
     const s = buildToInsertBatch(objs, table, attrs, buildParam)
-    if (s.query.length > 0) {
+    if (s.query) {
       return this.execWithTx(tx, commit, s.query, s.params)
     } else {
       return Promise.resolve(-1)

package/src/index.ts

@@ -38,14 +38,12 @@ export interface Config {
 
 // tslint:disable-next-line:max-classes-per-file
 export class Loader<T> {
-  map?: StringMap
   constructor(
-    public query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>,
-    public sql: string,
-    m?: StringMap,
-    public bools?: Attribute[],
+    protected query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>,
+    protected sql: string,
+    protected map?: StringMap,
+    protected bools?: Attribute[],
   ) {
-    this.map = m
     this.load = this.load.bind(this)
   }
   load(): Promise<T[]> {

package/src/services.ts

@@ -13,12 +13,12 @@ export type Load<T, ID> = (id: ID, ctx?: any) => Promise<T | null>
 export type Get<T, ID> = Load<T, ID>
 export function useGet<T, ID>(
   q: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+  param: (i: number) => string,
   table: string,
   attrs: Attributes | string[],
-  param: (i: number) => string,
   fromDB?: (v: T) => T,
 ): Load<T, ID> {
-  const l = new SqlLoader<T, ID>(q, table, attrs, param, fromDB)
+  const l = new SqlLoader<T, ID>(q, param, table, attrs, fromDB)
   return l.load
 }
 export const useLoad = useGet
@@ -29,9 +29,9 @@ export class SqlLoader<T, ID> {
   bools?: Attribute[]
   constructor(
     protected query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+    protected param: (i: number) => string,
     protected table: string,
     attrs: Attributes | string[],
-    protected param: (i: number) => string,
     protected fromDB?: (v: T) => T,
   ) {
     if (Array.isArray(attrs)) {
@@ -54,18 +54,18 @@ export class SqlLoader<T, ID> {
   metadata?(): Attributes | undefined {
     return this.attributes
   }
-  all(): Promise<T[]> {
+  all(ctx?: any): Promise<T[]> {
     const sql = `select * from ${this.table}`
-    return this.query(sql, [], this.map)
+    return this.query(sql, [], this.map, this.bools, ctx)
   }
   load(id: ID, ctx?: any): Promise<T | null> {
     const stmt = select<ID>(id, this.table, this.primaryKeys, this.param)
-    if (!stmt) {
+    if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
     const fn = this.fromDB
     if (fn) {
-      return this.query<T>(stmt.query, stmt.params, this.map, ctx).then((res) => {
+      return this.query<T>(stmt.query, stmt.params, this.map, this.bools, ctx).then((res) => {
         if (!res || res.length === 0) {
           return null
         } else {
@@ -74,21 +74,21 @@ export class SqlLoader<T, ID> {
         }
       })
     } else {
-      return this.query<T>(stmt.query, stmt.params, this.map).then((res) => (!res || res.length === 0 ? null : res[0]))
+      return this.query<T>(stmt.query, stmt.params, this.map, this.bools, ctx).then((res) => (!res || res.length === 0 ? null : res[0]))
     }
   }
   exist(id: ID, ctx?: any): Promise<boolean> {
     const field = this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name
     const stmt = exist<ID>(id, this.table, this.primaryKeys, this.param, field)
-    if (!stmt) {
+    if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then((res) => (!res || res.length === 0 ? false : true))
+    return this.query(stmt.query, stmt.params, undefined, undefined, ctx).then((res) => (!res || res.length === 0 ? false : true))
   }
 }
 // tslint:disable-next-line:max-classes-per-file
 export class QueryRepository<T, ID> {
-  constructor(public db: DB, public table: string, public attrs: Attributes, public sort?: string, id?: string) {
+  constructor(protected db: Executor, protected table: string, protected attrs: Attributes, protected sort?: string, id?: string) {
     this.id = id && id.length > 0 ? id : "id"
     this.query = this.query.bind(this)
     const m = metadata(attrs)
@@ -98,7 +98,7 @@ export class QueryRepository<T, ID> {
   id: string
   map?: StringMap
   bools?: Attribute[]
-  query(ids: ID[]): Promise<T[]> {
+  query(ids: ID[], ctx?: Transaction): Promise<T[]> {
     if (!ids || ids.length === 0) {
       return Promise.resolve([])
     }
@@ -111,18 +111,27 @@ export class QueryRepository<T, ID> {
     if (this.sort && this.sort.length > 0) {
       sql = sql + " order by " + this.sort
     }
-    return this.db.query<T>(sql, ids, this.map, this.bools)
+    const db = ctx ? ctx : this.db
+    return db.query<T>(sql, ids, this.map, this.bools)
   }
 }
 
-export interface DB {
+export interface Executor {
   driver: string
   param(i: number): string
   exec(sql: string, args?: any[], ctx?: any): Promise<number>
   execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
 }
-export type Manager = DB
+export interface Transaction extends Executor {
+  commit(): Promise<void>
+  rollback(): Promise<void>
+  end(): Promise<void>
+}
+export interface DB extends Executor {
+  beginTransaction(): Promise<Transaction>
+}
+// export type Manager = DB
 export interface FullDB {
   driver: string
   param(i: number): string
@@ -133,7 +142,7 @@ export interface FullDB {
   execScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T>
   count(sql: string, args?: any[], ctx?: any): Promise<number>
 }
-export type ExtManager = FullDB
+// export type ExtManager = FullDB
 export interface SimpleMap {
   [key: string]: string | number | boolean | Date
 }
@@ -145,7 +154,7 @@ export interface Logger {
   isDebugEnabled(): boolean
   isInfoEnabled(): boolean
 }
-export function log(db: ExtManager, isLog: boolean | undefined | null, logger: Logger, q?: string, result?: string, r?: string, duration?: string): ExtManager {
+export function log(db: FullDB, isLog: boolean | undefined | null, logger: Logger, q?: string, result?: string, r?: string, duration?: string): FullDB {
   if (!isLog) {
     return db
   }
@@ -161,7 +170,7 @@ export function log(db: ExtManager, isLog: boolean | undefined | null, logger: L
   return new LogManager(db, logger.error, logger.info, q, result, r, duration)
 }
 export function useLog(
-  db: ExtManager,
+  db: FullDB,
   isLog: boolean | undefined | null,
   err: ((msg: string, m?: SimpleMap) => void) | undefined,
   lg?: (msg: string, m?: SimpleMap) => void,
@@ -169,7 +178,7 @@ export function useLog(
   result?: string,
   r?: string,
   duration?: string,
-): ExtManager {
+): FullDB {
   if (!isLog) {
     return db
   }
@@ -179,9 +188,9 @@ export function useLog(
   return db
 }
 // tslint:disable-next-line:max-classes-per-file
-export class LogManager implements ExtManager {
+export class LogManager implements FullDB {
   constructor(
-    public db: ExtManager,
+    public db: FullDB,
     err: (msg: string, m?: SimpleMap) => void,
     lg?: (msg: string, m?: SimpleMap) => void,
     q?: string,
@@ -461,7 +470,7 @@ const getDurationInMilliseconds = (start: [number, number] | undefined) => {
 // tslint:disable-next-line:max-classes-per-file
 export class SqlWriter<T> {
   protected version?: string
-  constructor(protected exec: (sql: string, args?: any[], ctx?: any) => Promise<number>, protected param: (i: number) => string, protected table: string, protected attributes: Attributes, public toDB?: (v: T) => T) {
+  constructor(protected db: Executor, protected table: string, protected attributes: Attributes, protected toDB?: (v: T) => T) {
     const x = version(attributes)
     if (x) {
       this.version = x.name
@@ -470,14 +479,15 @@ export class SqlWriter<T> {
     this.update = this.update.bind(this)
     this.patch = this.patch.bind(this)
   }
-  create(obj: T, ctx?: any): Promise<number> {
+  create(obj: T, ctx?: Transaction): Promise<number> {
     let obj2 = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
-    const stmt = buildToInsert(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx).catch((err) => {
+    const stmt = buildToInsert(obj2, this.table, this.attributes, this.db.param, this.version)
+    if (stmt.query) {
+      const db = ctx ? ctx : this.db
+      return db.exec(stmt.query, stmt.params).catch((err) => {
         if (err && err.error === "duplicate") {
           return 0
         } else {
@@ -485,19 +495,20 @@ export class SqlWriter<T> {
         }
       })
     } else {
-      return Promise.resolve(0)
+      return Promise.resolve(-1)
     }
   }
-  update(obj: T, ctx?: any): Promise<number> {
+  update(obj: T, ctx?: Transaction): Promise<number> {
     let obj2 = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
-    const stmt = buildToUpdate(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx)
+    const stmt = buildToUpdate(obj2, this.table, this.attributes, this.db.param, this.version)
+    if (stmt.query) {
+      const db = ctx ? ctx : this.db
+      return db.exec(stmt.query, stmt.params)
     } else {
-      return Promise.resolve(0)
+      return Promise.resolve(-1)
     }
   }
   patch(obj: Partial<T>, ctx?: any): Promise<number> {
@@ -508,10 +519,8 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
   protected primaryKeys: Attribute[]
   protected map?: StringMap
   protected bools?: Attribute[]
-  protected query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>
-  constructor(db: DB, table: string, attributes: Attributes, toDB?: (v: T) => T, protected fromDB?: (v: T) => T) {
-    super(db.exec, db.param, table, attributes, toDB)
-    this.query = db.query
+  constructor(db: Executor, table: string, attributes: Attributes, toDB?: (v: T) => T, protected fromDB?: (v: T) => T) {
+    super(db, table, attributes, toDB)
     const m = metadata(attributes)
     this.primaryKeys = m.keys
     this.map = m.map
@@ -525,18 +534,20 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
   metadata(): Attributes {
     return this.attributes
   }
-  all(): Promise<T[]> {
+  all(ctx?: Transaction): Promise<T[]> {
     const sql = `select * from ${this.table}`
-    return this.query(sql, [], this.map)
+    const db = ctx ? ctx : this.db
+    return db.query(sql, [], this.map, this.bools)
   }
-  load(id: ID, ctx?: any): Promise<T | null> {
-    const stmt = select<ID>(id, this.table, this.primaryKeys, this.param)
-    if (stmt.query.length === 0) {
+  load(id: ID, ctx?: Transaction): Promise<T | null> {
+    const stmt = select<ID>(id, this.table, this.primaryKeys, this.db.param)
+    if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
     const fn = this.fromDB
+    const db = ctx ? ctx : this.db
     if (fn) {
-      return this.query<T>(stmt.query, stmt.params, this.map, ctx).then((res) => {
+      return db.query<T>(stmt.query, stmt.params, this.map, this.bools).then((res) => {
         if (!res || res.length === 0) {
           return null
         } else {
@@ -545,32 +556,33 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
         }
       })
     } else {
-      return this.query<T>(stmt.query, stmt.params, this.map).then((res) => (!res || res.length === 0 ? null : res[0]))
+      return db.query<T>(stmt.query, stmt.params, this.map, this.bools).then((res) => (!res || res.length === 0 ? null : res[0]))
     }
   }
-  exist(id: ID, ctx?: any): Promise<boolean> {
+  exist(id: ID, ctx?: Transaction): Promise<boolean> {
     const field = this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name
-    const stmt = exist<ID>(id, this.table, this.primaryKeys, this.param, field)
-    if (stmt.query.length === 0) {
+    const stmt = exist<ID>(id, this.table, this.primaryKeys, this.db.param, field)
+    if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then((res) => (!res || res.length === 0 ? false : true))
-  }
-  delete(id: ID, ctx?: any): Promise<number> {
-    const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.param)
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx)
+    const db = ctx ? ctx : this.db
+    return db.query(stmt.query, stmt.params).then((res) => (!res || res.length === 0 ? false : true))
+  }
+  delete(id: ID, ctx?: Transaction): Promise<number> {
+    const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.db.param)
+    if (stmt.query) {
+      const db = ctx ? ctx : this.db
+      return db.exec(stmt.query, stmt.params)
     } else {
-      return Promise.resolve(0)
+      return Promise.resolve(-1)
     }
   }
 }
 
 export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
   protected version?: string
-  protected exec: (sql: string, args?: any[], ctx?: any) => Promise<number>
   constructor(
-    db: DB,
+    protected db: Executor,
     table: string,
     protected attributes: Attributes,
     buildQ?: (
@@ -595,7 +607,6 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     total?: string,
   ) {
     super(db.query, table, attributes, db.driver, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
-    this.exec = db.exec
     const x = version(attributes)
     if (x) {
       this.version = x.name
@@ -604,14 +615,15 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     this.update = this.update.bind(this)
     this.patch = this.patch.bind(this)
   }
-  create(obj: T, ctx?: any): Promise<number> {
+  create(obj: T, ctx?: Transaction): Promise<number> {
     let obj2 = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
     const stmt = buildToInsert(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx).catch((err) => {
+    if (stmt.query) {
+      const db = ctx ? ctx : this.db
+      return db.exec(stmt.query, stmt.params).catch((err) => {
         if (err && err.error === "duplicate") {
           return 0
         } else {
@@ -619,29 +631,30 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
         }
       })
     } else {
-      return Promise.resolve(0)
+      return Promise.resolve(-1)
     }
   }
-  update(obj: T, ctx?: any): Promise<number> {
+  update(obj: T, ctx?: Transaction): Promise<number> {
     let obj2 = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
     const stmt = buildToUpdate(obj2, this.table, this.attributes, this.param, this.version)
-    if (stmt.query.length > 0) {
-      return this.exec(stmt.query, stmt.params, ctx)
+    if (stmt.query) {
+      const db = ctx ? ctx : this.db
+      return db.exec(stmt.query, stmt.params)
     } else {
-      return Promise.resolve(0)
+      return Promise.resolve(-1)
     }
   }
-  patch(obj: Partial<T>, ctx?: any): Promise<number> {
+  patch(obj: Partial<T>, ctx?: Transaction): Promise<number> {
     return this.update(obj as any, ctx)
   }
 }
 // tslint:disable-next-line:max-classes-per-file
 export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
   constructor(
-    db: DB,
+    db: Executor,
     table: string,
     protected attributes: Attributes,
     buildQ?: (
@@ -675,18 +688,20 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
   metadata(): Attributes {
     return this.attributes
   }
-  all(): Promise<T[]> {
+  all(ctx?: Transaction): Promise<T[]> {
     const sql = `select * from ${this.table}`
-    return this.query(sql, [], this.map)
+    const db = ctx ? ctx : this.db
+    return db.query(sql, [], this.map, this.bools)
   }
-  load(id: ID, ctx?: any): Promise<T | null> {
+  load(id: ID, ctx?: Transaction): Promise<T | null> {
     const stmt = select<ID>(id, this.table, this.primaryKeys, this.param)
     if (!stmt) {
       throw new Error("cannot build query by id")
     }
     const fn = this.fromDB
+    const db = ctx ? ctx : this.db
     if (fn) {
-      return this.query<T>(stmt.query, stmt.params, this.map, ctx).then((res) => {
+      return db.query<T>(stmt.query, stmt.params, this.map, this.bools).then((res) => {
         if (!res || res.length === 0) {
           return null
         } else {
@@ -695,23 +710,25 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
         }
       })
     } else {
-      return this.query<T>(stmt.query, stmt.params, this.map).then((res) => (!res || res.length === 0 ? null : res[0]))
+      return db.query<T>(stmt.query, stmt.params, this.map, this.bools).then((res) => (!res || res.length === 0 ? null : res[0]))
     }
   }
-  exist(id: ID, ctx?: any): Promise<boolean> {
+  exist(id: ID, ctx?: Transaction): Promise<boolean> {
     const field = this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name
     const stmt = exist<ID>(id, this.table, this.primaryKeys, this.param, field)
     if (!stmt) {
       throw new Error("cannot build query by id")
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then((res) => (!res || res.length === 0 ? false : true))
+    const db = ctx ? ctx : this.db
+    return db.query(stmt.query, stmt.params).then((res) => (!res || res.length === 0 ? false : true))
   }
-  delete(id: ID, ctx?: any): Promise<number> {
+  delete(id: ID, ctx?: Transaction): Promise<number> {
     const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.param)
-    if (stmt) {
-      return this.exec(stmt.query, stmt.params, ctx)
+    if (stmt.query) {
+      const db = ctx ? ctx : this.db
+      return db.exec(stmt.query, stmt.params)
     } else {
-      return Promise.resolve(0)
+      return Promise.resolve(-1)
     }
   }
 }
@@ -761,18 +778,18 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
   metadata?(): Attributes | undefined {
     return this.attrs
   }
-  all(): Promise<T[]> {
+  all(ctx?: any): Promise<T[]> {
     const sql = `select * from ${this.table}`
-    return this.query(sql, [], this.map)
+    return this.query(sql, [], this.map, this.bools, ctx)
   }
   load(id: ID, ctx?: any): Promise<T | null> {
     const stmt = select<ID>(id, this.table, this.primaryKeys, this.param)
-    if (!stmt) {
+    if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
     const fn = this.fromDB
     if (fn) {
-      return this.query<T>(stmt.query, stmt.params, this.map, ctx).then((res) => {
+      return this.query<T>(stmt.query, stmt.params, this.map, this.bools, ctx).then((res) => {
         if (!res || res.length === 0) {
           return null
         } else {
@@ -781,15 +798,15 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
         }
       })
     } else {
-      return this.query<T>(stmt.query, stmt.params, this.map).then((res) => (!res || res.length === 0 ? null : res[0]))
+      return this.query<T>(stmt.query, stmt.params, this.map, this.bools, ctx).then((res) => (!res || res.length === 0 ? null : res[0]))
     }
   }
   exist(id: ID, ctx?: any): Promise<boolean> {
     const field = this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name
     const stmt = exist<ID>(id, this.table, this.primaryKeys, this.param, field)
-    if (!stmt) {
+    if (stmt.query) {
       throw new Error("cannot build query by id")
     }
-    return this.query(stmt.query, stmt.params, this.map, undefined, ctx).then((res) => (!res || res.length === 0 ? false : true))
+    return this.query(stmt.query, stmt.params, undefined, undefined, ctx).then((res) => (!res || res.length === 0 ? false : true))
   }
 }