query-core 0.6.4 → 0.6.6

package/lib/SearchBuilder.js

@@ -8,11 +8,10 @@ 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) {
@@ -21,6 +20,9 @@ var SearchBuilder = (function () {
       this.map = meta.map;
       this.bools = meta.bools;
       this.primaryKeys = meta.keys;
+      this.version = meta.version;
+      this.createdAt = meta.createdAt;
+      this.updatedAt = meta.updatedAt;
     }
     else {
       this.primaryKeys = [];
@@ -30,23 +32,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 +41,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 +59,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/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

@@ -86,6 +86,9 @@ var SqlLoader = (function () {
   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;
@@ -154,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) {
@@ -199,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) {
@@ -312,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) {
@@ -416,11 +419,12 @@ var SqlWriter = (function () {
     this.attributes = attributes;
     this.toDB = toDB;
     var x = build_1.buildMetadata(attributes);
-    if (x) {
-      this.version = x.version;
-      this.createdAt = x.createdAt;
-      this.updatedAt = x.updatedAt;
-    }
+    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);
@@ -457,9 +461,6 @@ var SqlWriter = (function () {
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
-    if (this.createdAt) {
-      obj2[this.createdAt] = new Date();
-    }
     if (this.updatedAt) {
       obj2[this.updatedAt] = new Date();
     }
@@ -483,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.buildMetadata(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);
@@ -546,16 +543,18 @@ 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;
-    var x = build_1.version(attributes);
+    var x = build_1.buildMetadata(attributes);
     if (x) {
-      _this.version = x.name;
+      _this.version = x.version;
     }
     _this.create = _this.create.bind(_this);
     _this.update = _this.update.bind(_this);
@@ -567,7 +566,13 @@ var SqlSearchWriter = (function (_super) {
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
-    var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
+    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 = tx ? tx : this.db;
       return db.execute(stmt.query, stmt.params).catch(function (err) {
@@ -588,7 +593,10 @@ var SqlSearchWriter = (function (_super) {
     if (this.toDB) {
       obj2 = this.toDB(obj);
     }
-    var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
+    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 = tx ? tx : this.db;
       return db.execute(stmt.query, stmt.params);
@@ -605,8 +613,8 @@ var SqlSearchWriter = (function (_super) {
 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;
+  function SqlRepository(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, total) {
+    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);
@@ -625,7 +633,7 @@ var SqlRepository = (function (_super) {
     return db.query(sql, [], this.map, this.bools);
   };
   SqlRepository.prototype.load = function (id, tx) {
-    var stmt = build_1.select(id, this.table, this.primaryKeys, this.param);
+    var stmt = build_1.select(id, this.table, this.primaryKeys, this.db.param);
     if (!stmt.query) {
       throw new Error("cannot build query by id");
     }
@@ -648,7 +656,7 @@ var SqlRepository = (function (_super) {
   };
   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");
     }
@@ -656,7 +664,7 @@ var SqlRepository = (function (_super) {
     return db.query(stmt.query, stmt.params).then(function (res) { return (!res || res.length === 0 ? false : true); });
   };
   SqlRepository.prototype.delete = function (id, tx) {
-    var stmt = build_1.buildToDelete(id, this.table, this.primaryKeys, this.param);
+    var stmt = build_1.buildToDelete(id, this.table, this.primaryKeys, this.db.param);
     if (stmt.query) {
       var db = tx ? tx : this.db;
       return db.execute(stmt.query, stmt.params);
@@ -668,10 +676,11 @@ 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;
+  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;
@@ -687,18 +696,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;
         }
@@ -709,16 +720,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.4",
+  "version": "0.6.6",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/SearchBuilder.ts

@@ -8,11 +8,19 @@ export const mssql = "mssql"
 export const mysql = "mysql"
 export const sqlite = "sqlite"
 
+interface MinDB {
+  driver?: string
+  param(i: number): string
+  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
+}
 export class SearchBuilder<T, S> {
-  map?: StringMap
-  bools?: Attribute[]
-  primaryKeys: Attribute[]
-  buildQuery: (
+  protected map?: StringMap
+  protected bools?: Attribute[]
+  protected primaryKeys: Attribute[]
+  protected version?: string
+  protected createdAt?: string
+  protected updatedAt?: string
+  protected buildQuery: (
     s: S,
     param: (i: number) => string,
     sort?: string,
@@ -24,16 +32,14 @@ export class SearchBuilder<T, S> {
     strExcluding?: string,
     likeType?: LikeType
   ) => Statement | undefined
-  q?: string
-  excluding?: string
-  buildSort?: (sort?: string, map?: Attributes | StringMap) => string
-  param: (i: number) => string
-  total?: string
+  protected q?: string
+  protected excluding?: string
+  protected buildSort?: (sort?: string, map?: Attributes | StringMap) => string
+  protected total?: string
   constructor(
-    protected query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+    protected db: MinDB,
     protected table: string,
     protected attrs?: Attributes,
-    protected provider?: string,
     buildQ?: (
       s: S,
       param: (i: number) => string,
@@ -51,7 +57,6 @@ export class SearchBuilder<T, S> {
     q?: string,
     excluding?: string,
     buildSort?: (sort?: string, map?: Attributes | StringMap) => string,
-    buildParam?: (i: number) => string,
     total?: string,
   ) {
     if (attrs) {
@@ -60,6 +65,9 @@ export class SearchBuilder<T, S> {
       this.map = meta.map
       this.bools = meta.bools
       this.primaryKeys = meta.keys
+      this.version = meta.version
+      this.createdAt = meta.createdAt
+      this.updatedAt = meta.updatedAt
     } else {
       this.primaryKeys = []
     }
@@ -68,19 +76,6 @@ export class SearchBuilder<T, S> {
     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 === oracle) {
-        this.param = buildOracleParam
-      } else if (provider === postgres) {
-        this.param = buildDollarParam
-      } else if (provider === mssql) {
-        this.param = buildMsSQLParam
-      } else {
-        this.param = param
-      }
-    }
     this.total = total && total.length > 0 ? total : "total"
   }
   search(filter: S, limit: number, page?: number | string, fields?: string[]): Promise<SearchResult<T>> {
@@ -90,14 +85,14 @@ export class SearchBuilder<T, S> {
     }
     const st = this.sort ? this.sort : "sort"
     const sn = (filter as any)[st] as string
-    const likeType = this.provider === postgres ? "ilike" : "like"
-    const q2 = this.buildQuery(filter, this.param, sn, this.buildSort, this.attrs, this.table, fields, this.q, this.excluding, likeType)
+    const likeType = this.db.driver === postgres ? "ilike" : "like"
+    const 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")
     }
     const fn = this.fromDB
     if (fn) {
-      return buildFromQuery<T>(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total).then((r) => {
+      return buildFromQuery<T>(this.db.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.db.driver, this.total).then((r) => {
         if (r.list && r.list.length > 0) {
           r.list = r.list.map((o) => fn(o))
           return r
@@ -106,7 +101,8 @@ export class SearchBuilder<T, S> {
         }
       })
     } else {
-      return buildFromQuery(this.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.provider, this.total)
+      return buildFromQuery(this.db.query, q2.query, q2.params, limit, ipage, this.map, this.bools, this.db.driver, this.total)
     }
   }
 }
+export const SearchRepository = SearchBuilder

package/src/health.ts

@@ -39,6 +39,7 @@ export class Checker {
     return data
   }
 }
+export const SqlChecker = Checker
 
 function promiseTimeOut(timeoutInMilliseconds: number, promise: Promise<any>): Promise<any> {
   return Promise.race([

package/src/index.ts

@@ -1,16 +1,5 @@
-import { Checker } from "./health"
-export { Checker as SqlChecker }
-
 import { resource } from "./build"
 import { Attribute, StringMap } from "./metadata"
-import { SqlLoader, SqlWriter, CRUDRepository, SqlRepository } from "./services"
-// export {SqlLoader as SqlLoadRepository};
-export { CRUDRepository as GenericRepository, CRUDRepository as SqlGenericRepository, SqlLoader as SqlViewRepository }
-
-export { SqlWriter as SqlGenericService, SqlLoader as SqlLoadService, SqlLoader as SqlViewService }
-
-import { SearchBuilder } from "./SearchBuilder"
-export { SearchBuilder as SearchRepository, SqlRepository as Repository }
 
 export * from "./batch"
 export * from "./build"

package/src/services.ts

@@ -87,6 +87,10 @@ export class SqlLoader<T, ID> {
     return db.query(stmt.query, stmt.params, undefined, undefined).then((res) => (!res || res.length === 0 ? false : true))
   }
 }
+export const SqlViewRepository = SqlLoader
+export const SqlLoadService = SqlLoader
+export const SqlViewServic = SqlLoader
+
 // tslint:disable-next-line:max-classes-per-file
 export class QueryRepository<T, ID> {
   constructor(protected db: Executor, protected table: string, protected attrs: Attributes, protected sort?: string, id?: string) {
@@ -135,11 +139,11 @@ export interface DB extends Executor {
 export interface FullDB {
   driver: string
   param(i: number): string
-  exec(sql: string, args?: any[], ctx?: any): Promise<number>
-  execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
+  execute(sql: string, args?: any[], ctx?: any): Promise<number>
+  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
   queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T | null>
-  execScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T>
+  executeScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T>
   count(sql: string, args?: any[], ctx?: any): Promise<number>
 }
 // export type ExtManager = FullDB
@@ -207,11 +211,11 @@ export class LogManager implements FullDB {
     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)
   }
   log?: (msg: string, m?: SimpleMap, ctx?: any) => void
@@ -225,10 +229,10 @@ export class LogManager implements FullDB {
   param(i: number): string {
     return this.db.param(i)
   }
-  exec(sql: string, args?: any[], ctx?: any): Promise<number> {
+  execute(sql: string, args?: any[], ctx?: any): Promise<number> {
     const t1 = new Date()
     return this.db
-      .exec(sql, args, ctx)
+      .execute(sql, args, ctx)
       .then((v) => {
         setTimeout(() => {
           if (this.log) {
@@ -259,10 +263,10 @@ export class LogManager implements FullDB {
         throw er
       })
   }
-  execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number> {
+  executeBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number> {
     const t1 = new Date()
     return this.db
-      .execBatch(statements, firstSuccess, ctx)
+      .executeBatch(statements, firstSuccess, ctx)
       .then((v) => {
         setTimeout(() => {
           if (this.log) {
@@ -369,10 +373,10 @@ export class LogManager implements FullDB {
         throw er
       })
   }
-  execScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T> {
+  executeScalar<T>(sql: string, args?: any[], ctx?: any): Promise<T> {
     const t1 = new Date()
     return this.db
-      .execScalar<T>(sql, args, ctx)
+      .executeScalar<T>(sql, args, ctx)
       .then((v) => {
         setTimeout(() => {
           if (this.log) {
@@ -469,30 +473,35 @@ const getDurationInMilliseconds = (start: [number, number] | undefined) => {
 */
 // tslint:disable-next-line:max-classes-per-file
 export class SqlWriter<T> {
+  protected primaryKeys: Attribute[]
+  protected map?: StringMap
+  protected bools?: Attribute[]
   protected version?: string
   protected createdAt?: string
   protected updatedAt?: string
+  
   constructor(protected db: Executor, protected table: string, protected attributes: Attributes, protected toDB?: (v: T) => T) {
     const x = buildMetadata(attributes)
-    if (x) {
-      this.version = x.version
-      this.createdAt = x.createdAt
-      this.updatedAt = x.updatedAt
-    }
+    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)
   }
   create(obj: T, tx?: Transaction): Promise<number> {
-    let obj2 = obj
+    let obj2: any = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
     if (this.createdAt) {
-      (obj2 as any)[this.createdAt] = new Date()
+      obj2[this.createdAt] = new Date()
     }
     if (this.updatedAt) {
-      (obj2 as any)[this.updatedAt] = new Date()
+      obj2[this.updatedAt] = new Date()
     }
     const stmt = buildToInsert(obj2, this.table, this.attributes, this.db.param, this.version)
     if (stmt.query) {
@@ -509,15 +518,12 @@ export class SqlWriter<T> {
     }
   }
   update(obj: T, tx?: Transaction): Promise<number> {
-    let obj2 = obj
+    let obj2: any = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
-    if (this.createdAt) {
-      (obj2 as any)[this.createdAt] = new Date()
-    }
     if (this.updatedAt) {
-      (obj2 as any)[this.updatedAt] = new Date()
+      obj2[this.updatedAt] = new Date()
     }
     const stmt = buildToUpdate(obj2, this.table, this.attributes, this.db.param, this.version)
     if (stmt.query) {
@@ -532,15 +538,8 @@ export class SqlWriter<T> {
   }
 }
 export class CRUDRepository<T, ID> extends SqlWriter<T> {
-  protected primaryKeys: Attribute[]
-  protected map?: StringMap
-  protected bools?: Attribute[]
   constructor(db: Executor, table: string, attributes: Attributes, toDB?: (v: T) => T, protected fromDB?: (v: T) => T) {
     super(db, table, attributes, toDB)
-    const m = buildMetadata(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)
@@ -594,9 +593,10 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
     }
   }
 }
+export const GenericRepository = CRUDRepository
+export const SqlGenericRepository = CRUDRepository
 
 export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
-  protected version?: string
   constructor(
     protected db: Executor,
     table: string,
@@ -619,24 +619,29 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     q?: string,
     excluding?: string,
     buildSort?: (sort?: string, map?: Attributes | StringMap) => string,
-    buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(db.query, table, attributes, db.driver, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
-    const x = version(attributes)
+    super(db, table, attributes, buildQ, fromDB, sort, q, excluding, buildSort, total)
+    const x = buildMetadata(attributes)
     if (x) {
-      this.version = x.name
+      this.version = x.version
     }
     this.create = this.create.bind(this)
     this.update = this.update.bind(this)
     this.patch = this.patch.bind(this)
   }
   create(obj: T, tx?: Transaction): Promise<number> {
-    let obj2 = obj
+    let obj2: any = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
-    const stmt = buildToInsert(obj2, this.table, this.attributes, this.param, this.version)
+    if (this.createdAt) {
+      obj2[this.createdAt] = new Date()
+    }
+    if (this.updatedAt) {
+      obj2[this.updatedAt] = new Date()
+    }
+    const stmt = buildToInsert(obj2, this.table, this.attributes, this.db.param, this.version)
     if (stmt.query) {
       const db = tx ? tx: this.db
       return db.execute(stmt.query, stmt.params).catch((err) => {
@@ -651,11 +656,14 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
     }
   }
   update(obj: T, tx?: Transaction): Promise<number> {
-    let obj2 = obj
+    let obj2: any = obj
     if (this.toDB) {
       obj2 = this.toDB(obj)
     }
-    const stmt = buildToUpdate(obj2, this.table, this.attributes, this.param, this.version)
+    if (this.updatedAt) {
+      obj2[this.updatedAt] = new Date()
+    }
+    const stmt = buildToUpdate(obj2, this.table, this.attributes, this.db.param, this.version)
     if (stmt.query) {
       const db = tx ? tx: this.db
       return db.execute(stmt.query, stmt.params)
@@ -691,10 +699,9 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     q?: string,
     excluding?: string,
     buildSort?: (sort?: string, map?: Attributes | StringMap) => string,
-    buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, buildParam, total)
+    super(db, table, attributes, buildQ, toDB, fromDB, sort, q, excluding, buildSort, total)
     this.metadata = this.metadata.bind(this)
     this.all = this.all.bind(this)
     this.load = this.load.bind(this)
@@ -710,7 +717,7 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     return db.query(sql, [], this.map, this.bools)
   }
   load(id: ID, tx?: Transaction): Promise<T | null> {
-    const stmt = select<ID>(id, this.table, this.primaryKeys, this.param)
+    const stmt = select<ID>(id, this.table, this.primaryKeys, this.db.param)
     if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
@@ -731,7 +738,7 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
   }
   exist(id: ID, tx?: 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)
+    const stmt = exist<ID>(id, this.table, this.primaryKeys, this.db.param, field)
     if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
@@ -739,7 +746,7 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     return db.query(stmt.query, stmt.params).then((res) => (!res || res.length === 0 ? false : true))
   }
   delete(id: ID, tx?: Transaction): Promise<number> {
-    const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.param)
+    const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.db.param)
     if (stmt.query) {
       const db = tx ? tx: this.db
       return db.execute(stmt.query, stmt.params)
@@ -748,14 +755,17 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
     }
   }
 }
+export const Repository = SqlRepository
+
+interface MinDB {
+  driver?: string
+  param(i: number): string
+  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>
+}
 // tslint:disable-next-line:max-classes-per-file
 export class Query<T, ID, S> extends SearchBuilder<T, S> {
-  primaryKeys: Attribute[]
-  map?: StringMap
-  // attributes: Attributes;
-  bools?: Attribute[]
   constructor(
-    query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+    db: MinDB,
     table: string,
     attributes: Attributes,
     buildQ?: (
@@ -770,16 +780,14 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
       strExcluding?: string,
       likeType?: LikeType
     ) => Statement | undefined,
-    provider?: string,
     fromDB?: (v: T) => T,
     sort?: string,
     q?: string,
     excluding?: string,
     buildSort?: (sort?: string, map?: Attributes | StringMap) => string,
-    buildParam?: (i: number) => string,
     total?: string,
   ) {
-    super(query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
+    super(db, table, attributes, buildQ, fromDB, sort, q, excluding, buildSort, total)
     const m = buildMetadata(attributes)
     this.primaryKeys = m.keys
     this.map = m.map
@@ -794,18 +802,20 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
   metadata?(): Attributes | undefined {
     return this.attrs
   }
-  all(ctx?: any): Promise<T[]> {
+  all(tx?: Transaction): Promise<T[]> {
     const sql = `select * from ${this.table}`
-    return this.query(sql, [], this.map, this.bools, ctx)
+    const db = tx ? tx : 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)
+  load(id: ID, tx?: 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 db = tx ? tx : this.db
     const fn = this.fromDB
     if (fn) {
-      return this.query<T>(stmt.query, stmt.params, this.map, this.bools, 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 {
@@ -814,15 +824,16 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
         }
       })
     } else {
-      return this.query<T>(stmt.query, stmt.params, this.map, this.bools, ctx).then((res) => (!res || res.length === 0 ? null : res[0]))
+      return this.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, tx?: 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)
+    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, undefined, undefined, ctx).then((res) => (!res || res.length === 0 ? false : true))
+    const db = tx ? tx : this.db
+    return db.query(stmt.query, stmt.params, undefined, undefined).then((res) => (!res || res.length === 0 ? false : true))
   }
 }