query-core 0.6.3 → 0.6.5

package/lib/SearchBuilder.js

@@ -8,16 +8,15 @@ exports.mssql = "mssql";
 exports.mysql = "mysql";
 exports.sqlite = "sqlite";
 var SearchBuilder = (function () {
-  function SearchBuilder(query, table, attrs, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) {
-    this.query = query;
+  function SearchBuilder(db, table, attrs, buildQ, fromDB, sort, q, excluding, buildSort, total) {
+    this.db = db;
     this.table = table;
     this.attrs = attrs;
-    this.provider = provider;
     this.fromDB = fromDB;
     this.sort = sort;
     if (attrs) {
       this.attrs = attrs;
-      var meta = build_1.metadata(attrs);
+      var meta = build_1.buildMetadata(attrs);
       this.map = meta.map;
       this.bools = meta.bools;
       this.primaryKeys = meta.keys;
@@ -30,23 +29,6 @@ var SearchBuilder = (function () {
     this.q = q && q.length > 0 ? q : "q";
     this.excluding = excluding && excluding.length > 0 ? excluding : "excluding";
     this.search = this.search.bind(this);
-    if (buildParam) {
-      this.param = buildParam;
-    }
-    else {
-      if (provider === search_1.oracle) {
-        this.param = query_1.buildOracleParam;
-      }
-      else if (provider === exports.postgres) {
-        this.param = query_1.buildDollarParam;
-      }
-      else if (provider === exports.mssql) {
-        this.param = query_1.buildMsSQLParam;
-      }
-      else {
-        this.param = build_1.param;
-      }
-    }
     this.total = total && total.length > 0 ? total : "total";
   }
   SearchBuilder.prototype.search = function (filter, limit, page, fields) {
@@ -56,14 +38,14 @@ var SearchBuilder = (function () {
     }
     var st = this.sort ? this.sort : "sort";
     var sn = filter[st];
-    var likeType = this.provider === exports.postgres ? "ilike" : "like";
-    var q2 = this.buildQuery(filter, this.param, sn, this.buildSort, this.attrs, this.table, fields, this.q, this.excluding, likeType);
+    var likeType = this.db.driver === exports.postgres ? "ilike" : "like";
+    var q2 = this.buildQuery(filter, this.db.param, sn, this.buildSort, this.attrs, this.table, fields, this.q, this.excluding, likeType);
     if (!q2) {
       throw new Error("Cannot build query");
     }
     var fn = this.fromDB;
     if (fn) {
-      return search_1.buildFromQuery(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total).then(function (r) {
+      return search_1.buildFromQuery(this.db.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.db.driver, this.total).then(function (r) {
         if (r.list && r.list.length > 0) {
           r.list = r.list.map(function (o) { return fn(o); });
           return r;
@@ -74,9 +56,10 @@ var SearchBuilder = (function () {
       });
     }
     else {
-      return search_1.buildFromQuery(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total);
+      return search_1.buildFromQuery(this.db.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.db.driver, this.total);
     }
   };
   return SearchBuilder;
 }());
 exports.SearchBuilder = SearchBuilder;
+exports.SearchRepository = SearchBuilder;

package/lib/build.js

@@ -543,7 +543,7 @@ function updateBatch(exec, objs, table, attrs, buildParam, notSkipInvalid) {
 exports.updateBatch = updateBatch;
 function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
   var sts = [];
-  var meta = metadata(attrs);
+  var meta = buildMetadata(attrs);
   if (!meta.keys || meta.keys.length === 0) {
     return sts;
   }
@@ -724,7 +724,7 @@ function buildMap(attrs) {
   return mp;
 }
 exports.buildMap = buildMap;
-function metadata(attrs) {
+function buildMetadata(attrs) {
   var mp = {};
   var ks = Object.keys(attrs);
   var ats = [];
@@ -748,6 +748,12 @@ function metadata(attrs) {
     if (attr.version) {
       m.version = k;
     }
+    if (attr.updatedAt) {
+      m.updatedAt = k;
+    }
+    else if (attr.createdAt) {
+      m.createdAt = k;
+    }
     var field = attr.column ? attr.column : k;
     var s = field.toLowerCase();
     if (s !== k) {
@@ -763,7 +769,7 @@ function metadata(attrs) {
   }
   return m;
 }
-exports.metadata = metadata;
+exports.buildMetadata = buildMetadata;
 function attributes(attrs, isKey) {
   var ks = [];
   for (var _i = 0, attrs_1 = attrs; _i < attrs_1.length; _i++) {

package/lib/health.js

@@ -77,6 +77,7 @@ var Checker = (function () {
   return Checker;
 }());
 exports.Checker = Checker;
+exports.SqlChecker = Checker;
 function promiseTimeOut(timeoutInMilliseconds, promise) {
   return Promise.race([
     promise,

package/lib/index.js

@@ -3,19 +3,7 @@ function __export(m) {
   for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 Object.defineProperty(exports, "__esModule", { value: true });
-var health_1 = require("./health");
-exports.SqlChecker = health_1.Checker;
 var build_1 = require("./build");
-var services_1 = require("./services");
-exports.SqlViewRepository = services_1.SqlLoader;
-exports.SqlLoadService = services_1.SqlLoader;
-exports.SqlViewService = services_1.SqlLoader;
-exports.SqlGenericService = services_1.SqlWriter;
-exports.GenericRepository = services_1.CRUDRepository;
-exports.SqlGenericRepository = services_1.CRUDRepository;
-exports.Repository = services_1.SqlRepository;
-var SearchBuilder_1 = require("./SearchBuilder");
-exports.SearchRepository = SearchBuilder_1.SearchBuilder;
 __export(require("./batch"));
 __export(require("./build"));
 __export(require("./client"));

package/lib/services.js

@@ -15,16 +15,15 @@ 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, param, table, attrs, fromDB) {
-  var l = new SqlLoader(q, param, table, attrs, fromDB);
+function useGet(db, table, attrs, fromDB) {
+  var l = new SqlLoader(db, table, attrs, fromDB);
   return l.load;
 }
 exports.useGet = useGet;
 exports.useLoad = useGet;
 var SqlLoader = (function () {
-  function SqlLoader(query, param, table, attrs, fromDB) {
-    this.query = query;
-    this.param = param;
+  function SqlLoader(db, table, attrs, fromDB) {
+    this.db = db;
     this.table = table;
     this.fromDB = fromDB;
     if (Array.isArray(attrs)) {
@@ -32,7 +31,7 @@ var SqlLoader = (function () {
       this.attributes = {};
     }
     else {
-      var m = build_1.metadata(attrs);
+      var m = build_1.buildMetadata(attrs);
       this.attributes = attrs;
       this.primaryKeys = m.keys;
       this.map = m.map;
@@ -48,18 +47,20 @@ var SqlLoader = (function () {
   SqlLoader.prototype.metadata = function () {
     return this.attributes;
   };
-  SqlLoader.prototype.all = function (ctx) {
+  SqlLoader.prototype.all = function (tx) {
     var sql = "select * from " + this.table;
-    return this.query(sql, [], this.map, this.bools, ctx);
+    var db = tx ? tx : this.db;
+    return db.query(sql, [], this.map, this.bools);
   };
-  SqlLoader.prototype.load = function (id, ctx) {
-    var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
+  SqlLoader.prototype.load = function (id, tx) {
+    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 db = tx ? tx : this.db;
     var fn = this.fromDB;
     if (fn) {
-      return this.query(stmt.query, stmt.params, this.map, this.bools, 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;
         }
@@ -70,20 +71,24 @@ var SqlLoader = (function () {
       });
     }
     else {
-      return this.query(stmt.query, stmt.params, this.map, this.bools, ctx).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]); });
     }
   };
-  SqlLoader.prototype.exist = function (id, ctx) {
+  SqlLoader.prototype.exist = function (id, tx) {
     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);
+    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, undefined, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
+    var db = tx ? tx : this.db;
+    return db.query(stmt.query, stmt.params, undefined, undefined).then(function (res) { return (!res || res.length === 0 ? false : true); });
   };
   return SqlLoader;
 }());
 exports.SqlLoader = SqlLoader;
+exports.SqlViewRepository = SqlLoader;
+exports.SqlLoadService = SqlLoader;
+exports.SqlViewServic = SqlLoader;
 var QueryRepository = (function () {
   function QueryRepository(db, table, attrs, sort, id) {
     this.db = db;
@@ -92,11 +97,11 @@ var QueryRepository = (function () {
     this.sort = sort;
     this.id = id && id.length > 0 ? id : "id";
     this.query = this.query.bind(this);
-    var m = build_1.metadata(attrs);
+    var m = build_1.buildMetadata(attrs);
     this.map = m.map;
     this.bools = m.bools;
   }
-  QueryRepository.prototype.query = function (ids, ctx) {
+  QueryRepository.prototype.query = function (ids, tx) {
     if (!ids || ids.length === 0) {
       return Promise.resolve([]);
     }
@@ -109,7 +114,7 @@ var QueryRepository = (function () {
     if (this.sort && this.sort.length > 0) {
       sql = sql + " order by " + this.sort;
     }
-    var db = ctx ? ctx : this.db;
+    var db = tx ? tx : this.db;
     return db.query(sql, ids, this.map, this.bools);
   };
   return QueryRepository;
@@ -152,21 +157,21 @@ var LogManager = (function () {
     this.log = lg;
     this.error = err;
     this.param = this.param.bind(this);
-    this.exec = this.exec.bind(this);
-    this.execBatch = this.execBatch.bind(this);
+    this.execute = this.execute.bind(this);
+    this.executeBatch = this.executeBatch.bind(this);
     this.query = this.query.bind(this);
     this.queryOne = this.queryOne.bind(this);
-    this.execScalar = this.execScalar.bind(this);
+    this.executeScalar = this.executeScalar.bind(this);
     this.count = this.count.bind(this);
   }
   LogManager.prototype.param = function (i) {
     return this.db.param(i);
   };
-  LogManager.prototype.exec = function (sql, args, ctx) {
+  LogManager.prototype.execute = function (sql, args, ctx) {
     var _this = this;
     var t1 = new Date();
     return this.db
-      .exec(sql, args, ctx)
+      .execute(sql, args, ctx)
       .then(function (v) {
       setTimeout(function () {
         if (_this.log) {
@@ -197,11 +202,11 @@ var LogManager = (function () {
       throw er;
     });
   };
-  LogManager.prototype.execBatch = function (statements, firstSuccess, ctx) {
+  LogManager.prototype.executeBatch = function (statements, firstSuccess, ctx) {
     var _this = this;
     var t1 = new Date();
     return this.db
-      .execBatch(statements, firstSuccess, ctx)
+      .executeBatch(statements, firstSuccess, ctx)
       .then(function (v) {
       setTimeout(function () {
         if (_this.log) {
@@ -310,11 +315,11 @@ var LogManager = (function () {
       throw er;
     });
   };
-  LogManager.prototype.execScalar = function (sql, args, ctx) {
+  LogManager.prototype.executeScalar = function (sql, args, ctx) {
     var _this = this;
     var t1 = new Date();
     return this.db
-      .execScalar(sql, args, ctx)
+      .executeScalar(sql, args, ctx)
       .then(function (v) {
       setTimeout(function () {
         if (_this.log) {
@@ -413,23 +418,32 @@ var SqlWriter = (function () {
     this.table = table;
     this.attributes = attributes;
     this.toDB = toDB;
-    var x = build_1.version(attributes);
-    if (x) {
-      this.version = x.name;
-    }
+    var x = build_1.buildMetadata(attributes);
+    this.primaryKeys = x.keys;
+    this.map = x.map;
+    this.bools = x.bools;
+    this.version = x.version;
+    this.createdAt = x.createdAt;
+    this.updatedAt = x.updatedAt;
     this.create = this.create.bind(this);
     this.update = this.update.bind(this);
     this.patch = this.patch.bind(this);
   }
-  SqlWriter.prototype.create = function (obj, ctx) {
+  SqlWriter.prototype.create = function (obj, tx) {
     var obj2 = obj;
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
+    if (this.createdAt) {
+      obj2[this.createdAt] = new Date();
+    }
+    if (this.updatedAt) {
+      obj2[this.updatedAt] = new Date();
+    }
     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) {
+      var db = tx ? tx : this.db;
+      return db.execute(stmt.query, stmt.params).catch(function (err) {
         if (err && err.error === "duplicate") {
           return 0;
         }
@@ -442,22 +456,25 @@ var SqlWriter = (function () {
       return Promise.resolve(-1);
     }
   };
-  SqlWriter.prototype.update = function (obj, ctx) {
+  SqlWriter.prototype.update = function (obj, tx) {
     var obj2 = obj;
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
+    if (this.updatedAt) {
+      obj2[this.updatedAt] = new Date();
+    }
     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);
+      var db = tx ? tx : this.db;
+      return db.execute(stmt.query, stmt.params);
     }
     else {
       return Promise.resolve(-1);
     }
   };
-  SqlWriter.prototype.patch = function (obj, ctx) {
-    return this.update(obj, ctx);
+  SqlWriter.prototype.patch = function (obj, tx) {
+    return this.update(obj, tx);
   };
   return SqlWriter;
 }());
@@ -467,10 +484,6 @@ var CRUDRepository = (function (_super) {
   function CRUDRepository(db, table, attributes, toDB, fromDB) {
     var _this = _super.call(this, db, table, attributes, toDB) || this;
     _this.fromDB = fromDB;
-    var m = build_1.metadata(attributes);
-    _this.primaryKeys = m.keys;
-    _this.map = m.map;
-    _this.bools = m.bools;
     _this.metadata = _this.metadata.bind(_this);
     _this.all = _this.all.bind(_this);
     _this.load = _this.load.bind(_this);
@@ -481,18 +494,18 @@ var CRUDRepository = (function (_super) {
   CRUDRepository.prototype.metadata = function () {
     return this.attributes;
   };
-  CRUDRepository.prototype.all = function (ctx) {
+  CRUDRepository.prototype.all = function (tx) {
     var sql = "select * from " + this.table;
-    var db = ctx ? ctx : this.db;
+    var db = tx ? tx : this.db;
     return db.query(sql, [], this.map, this.bools);
   };
-  CRUDRepository.prototype.load = function (id, ctx) {
+  CRUDRepository.prototype.load = function (id, tx) {
     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;
+    var db = tx ? tx : this.db;
     if (fn) {
       return db.query(stmt.query, stmt.params, this.map, this.bools).then(function (res) {
         if (!res || res.length === 0) {
@@ -508,20 +521,20 @@ var CRUDRepository = (function (_super) {
       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) {
+  CRUDRepository.prototype.exist = function (id, tx) {
     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.db.param, field);
     if (!stmt.query) {
       throw new Error("cannot build query by id");
     }
-    var db = ctx ? ctx : this.db;
+    var db = tx ? tx : 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) {
+  CRUDRepository.prototype.delete = function (id, tx) {
     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);
+      var db = tx ? tx : this.db;
+      return db.execute(stmt.query, stmt.params);
     }
     else {
       throw new Error("cannot build delete query by id");
@@ -530,10 +543,12 @@ var CRUDRepository = (function (_super) {
   return CRUDRepository;
 }(SqlWriter));
 exports.CRUDRepository = CRUDRepository;
+exports.GenericRepository = CRUDRepository;
+exports.SqlGenericRepository = CRUDRepository;
 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;
+  function SqlSearchWriter(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, total) {
+    var _this = _super.call(this, db, table, attributes, buildQ, fromDB, sort, q, excluding, buildSort, total) || this;
     _this.db = db;
     _this.attributes = attributes;
     _this.toDB = toDB;
@@ -546,15 +561,15 @@ var SqlSearchWriter = (function (_super) {
     _this.patch = _this.patch.bind(_this);
     return _this;
   }
-  SqlSearchWriter.prototype.create = function (obj, ctx) {
+  SqlSearchWriter.prototype.create = function (obj, tx) {
     var obj2 = obj;
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
-    var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
+    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) {
+      var db = tx ? tx : this.db;
+      return db.execute(stmt.query, stmt.params).catch(function (err) {
         if (err && err.error === "duplicate") {
           return 0;
         }
@@ -567,22 +582,22 @@ var SqlSearchWriter = (function (_super) {
       return Promise.resolve(-1);
     }
   };
-  SqlSearchWriter.prototype.update = function (obj, ctx) {
+  SqlSearchWriter.prototype.update = function (obj, tx) {
     var obj2 = obj;
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
-    var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
+    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);
+      var db = tx ? tx : this.db;
+      return db.execute(stmt.query, stmt.params);
     }
     else {
       return Promise.resolve(-1);
     }
   };
-  SqlSearchWriter.prototype.patch = function (obj, ctx) {
-    return this.update(obj, ctx);
+  SqlSearchWriter.prototype.patch = function (obj, tx) {
+    return this.update(obj, tx);
   };
   return SqlSearchWriter;
 }(SearchBuilder_1.SearchBuilder));
@@ -590,7 +605,7 @@ exports.SqlSearchWriter = SqlSearchWriter;
 var SqlRepository = (function (_super) {
   __extends(SqlRepository, _super);
   function SqlRepository(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) {
-    var _this = _super.call(this, db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
+    var _this = _super.call(this, db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, total) || this;
     _this.attributes = attributes;
     _this.toDB = toDB;
     _this.metadata = _this.metadata.bind(_this);
@@ -603,18 +618,18 @@ var SqlRepository = (function (_super) {
   SqlRepository.prototype.metadata = function () {
     return this.attributes;
   };
-  SqlRepository.prototype.all = function (ctx) {
+  SqlRepository.prototype.all = function (tx) {
     var sql = "select * from " + this.table;
-    var db = ctx ? ctx : this.db;
+    var db = tx ? tx : 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);
+  SqlRepository.prototype.load = function (id, tx) {
+    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;
+    var db = tx ? tx : this.db;
     if (fn) {
       return db.query(stmt.query, stmt.params, this.map, this.bools).then(function (res) {
         if (!res || res.length === 0) {
@@ -630,20 +645,20 @@ var SqlRepository = (function (_super) {
       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) {
+  SqlRepository.prototype.exist = function (id, tx) {
     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);
+    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");
     }
-    var db = ctx ? ctx : this.db;
+    var db = tx ? tx : 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);
+  SqlRepository.prototype.delete = function (id, tx) {
+    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);
+      var db = tx ? tx : this.db;
+      return db.execute(stmt.query, stmt.params);
     }
     else {
       throw new Error("cannot build delete query by id");
@@ -652,11 +667,12 @@ var SqlRepository = (function (_super) {
   return SqlRepository;
 }(SqlSearchWriter));
 exports.SqlRepository = SqlRepository;
+exports.Repository = SqlRepository;
 var Query = (function (_super) {
   __extends(Query, _super);
-  function Query(query, table, attributes, buildQ, provider, fromDB, sort, q, excluding, buildSort, buildParam, total) {
-    var _this = _super.call(this, query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total) || this;
-    var m = build_1.metadata(attributes);
+  function Query(db, table, attributes, buildQ, fromDB, sort, q, excluding, buildSort, total) {
+    var _this = _super.call(this, db, table, attributes, buildQ, fromDB, sort, q, excluding, buildSort, total) || this;
+    var m = build_1.buildMetadata(attributes);
     _this.primaryKeys = m.keys;
     _this.map = m.map;
     _this.bools = m.bools;
@@ -671,18 +687,20 @@ var Query = (function (_super) {
   Query.prototype.metadata = function () {
     return this.attrs;
   };
-  Query.prototype.all = function (ctx) {
+  Query.prototype.all = function (tx) {
     var sql = "select * from " + this.table;
-    return this.query(sql, [], this.map, this.bools, ctx);
+    var db = tx ? tx : this.db;
+    return db.query(sql, [], this.map, this.bools);
   };
-  Query.prototype.load = function (id, ctx) {
-    var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
+  Query.prototype.load = function (id, tx) {
+    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 db = tx ? tx : this.db;
     var fn = this.fromDB;
     if (fn) {
-      return this.query(stmt.query, stmt.params, this.map, this.bools, 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;
         }
@@ -693,16 +711,17 @@ var Query = (function (_super) {
       });
     }
     else {
-      return this.query(stmt.query, stmt.params, this.map, this.bools, ctx).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
+      return this.db.query(stmt.query, stmt.params, this.map, this.bools).then(function (res) { return (!res || res.length === 0 ? null : res[0]); });
     }
   };
-  Query.prototype.exist = function (id, ctx) {
+  Query.prototype.exist = function (id, tx) {
     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);
+    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, undefined, undefined, ctx).then(function (res) { return (!res || res.length === 0 ? false : true); });
+    var db = tx ? tx : this.db;
+    return db.query(stmt.query, stmt.params, undefined, undefined).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.3",
+  "version": "0.6.5",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",