query-core 0.6.2 → 0.6.4

package/lib/SearchBuilder.js

@@ -17,7 +17,7 @@ var SearchBuilder = (function () {
     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;

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/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,16 +71,17 @@ 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;
 }());
@@ -92,11 +94,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 +111,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;
@@ -413,23 +415,31 @@ var SqlWriter = (function () {
     this.table = table;
     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.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 +452,28 @@ 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.createdAt) {
+      obj2[this.createdAt] = new Date();
+    }
+    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,7 +483,7 @@ 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);
+    var m = build_1.buildMetadata(attributes);
     _this.primaryKeys = m.keys;
     _this.map = m.map;
     _this.bools = m.bools;
@@ -481,18 +497,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,23 +524,23 @@ 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 {
-      return Promise.resolve(-1);
+      throw new Error("cannot build delete query by id");
     }
   };
   return CRUDRepository;
@@ -546,15 +562,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);
     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 +583,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);
     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));
@@ -603,18 +619,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) {
+  SqlRepository.prototype.load = function (id, tx) {
     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;
-    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,23 +646,23 @@ 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);
-    if (!stmt) {
+    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) {
+  SqlRepository.prototype.delete = function (id, tx) {
     var stmt = build_1.buildToDelete(id, this.table, this.primaryKeys, this.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 {
-      return Promise.resolve(-1);
+      throw new Error("cannot build delete query by id");
     }
   };
   return SqlRepository;
@@ -656,7 +672,7 @@ 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);
+    var m = build_1.buildMetadata(attributes);
     _this.primaryKeys = m.keys;
     _this.map = m.map;
     _this.bools = m.bools;
@@ -699,7 +715,7 @@ var Query = (function (_super) {
   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.query) {
+    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); });

package/package.json

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

package/src/SearchBuilder.ts

@@ -1,4 +1,4 @@
-import { metadata, param } from "./build"
+import { buildMetadata, param } from "./build"
 import { Attribute, Attributes, Statement, StringMap } from "./metadata"
 import { buildSort as bs, buildDollarParam, buildMsSQLParam, buildOracleParam, buildQuery, LikeType } from "./query"
 import { buildFromQuery, oracle, SearchResult } from "./search"
@@ -56,7 +56,7 @@ export class SearchBuilder<T, S> {
   ) {
     if (attrs) {
       this.attrs = attrs
-      const meta = metadata(attrs)
+      const meta = buildMetadata(attrs)
       this.map = meta.map
       this.bools = meta.bools
       this.primaryKeys = meta.keys

package/src/build.ts

@@ -509,7 +509,7 @@ export function buildToUpdateBatch<T>(
   notSkipInvalid?: boolean,
 ): Statement[] {
   const sts: Statement[] = []
-  const meta = metadata(attrs)
+  const meta = buildMetadata(attrs)
   if (!meta.keys || meta.keys.length === 0) {
     return sts
   }
@@ -670,8 +670,10 @@ export interface Metadata {
   map?: StringMap
   version?: string
   fields?: string[]
+  updatedAt?: string
+  createdAt?: string
 }
-export function metadata(attrs: Attributes): Metadata {
+export function buildMetadata(attrs: Attributes): Metadata {
   const mp: StringMap = {}
   const ks = Object.keys(attrs)
   const ats: Attribute[] = []
@@ -694,6 +696,11 @@ export function metadata(attrs: Attributes): Metadata {
     if (attr.version) {
       m.version = k
     }
+    if (attr.updatedAt) {
+      m.updatedAt = k
+    } else if (attr.createdAt) {
+      m.createdAt = k
+    }
     const field = attr.column ? attr.column : k
     const s = field.toLowerCase()
     if (s !== k) {

package/src/metadata.ts

@@ -41,15 +41,6 @@ export type DataType =
   | "times"
 export type Operator = "=" | "like" | "!=" | "<>" | ">" | ">=" | "<" | "<="
 
-export interface Model {
-  name?: string
-  attributes: Attributes
-  source?: string
-  table?: string
-  collection?: string
-  model?: any
-  schema?: any
-}
 export interface Attribute {
   name?: string
   column?: string
@@ -65,6 +56,8 @@ export interface Attribute {
   ignored?: boolean
   true?: string | number
   false?: string | number
+  createdAt?: boolean
+  updatedAt?: boolean
 }
 export interface Attributes {
   [key: string]: Attribute

package/src/services.ts

@@ -1,4 +1,4 @@
-import { attributes, buildToDelete, buildToInsert, buildToUpdate, exist, metadata, select, version } from "./build"
+import { attributes, buildToDelete, buildToInsert, buildToUpdate, exist, buildMetadata, select, version } from "./build"
 import { Attribute, Attributes, Statement, StringMap } from "./metadata"
 import { LikeType } from "./query"
 import { SearchBuilder } from "./SearchBuilder"
@@ -12,13 +12,12 @@ export interface Filter {
 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,
+  db: DB,
   table: string,
   attrs: Attributes | string[],
   fromDB?: (v: T) => T,
 ): Load<T, ID> {
-  const l = new SqlLoader<T, ID>(q, param, table, attrs, fromDB)
+  const l = new SqlLoader<T, ID>(db, table, attrs, fromDB)
   return l.load
 }
 export const useLoad = useGet
@@ -28,8 +27,7 @@ export class SqlLoader<T, ID> {
   attributes: Attributes
   bools?: Attribute[]
   constructor(
-    protected query: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
-    protected param: (i: number) => string,
+    protected db: DB,
     protected table: string,
     attrs: Attributes | string[],
     protected fromDB?: (v: T) => T,
@@ -38,7 +36,7 @@ export class SqlLoader<T, ID> {
       this.primaryKeys = attributes(attrs)
       this.attributes = {} as any
     } else {
-      const m = metadata(attrs)
+      const m = buildMetadata(attrs)
       this.attributes = attrs
       this.primaryKeys = m.keys
       this.map = m.map
@@ -54,18 +52,20 @@ export class SqlLoader<T, ID> {
   metadata?(): Attributes | undefined {
     return this.attributes
   }
-  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 {
@@ -74,16 +74,17 @@ export class SqlLoader<T, ID> {
         }
       })
     } else {
-      return this.query<T>(stmt.query, stmt.params, this.map, this.bools, ctx).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, 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))
   }
 }
 // tslint:disable-next-line:max-classes-per-file
@@ -91,14 +92,14 @@ export class QueryRepository<T, ID> {
   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)
+    const m = buildMetadata(attrs)
     this.map = m.map
     this.bools = m.bools
   }
   id: string
   map?: StringMap
   bools?: Attribute[]
-  query(ids: ID[], ctx?: Transaction): Promise<T[]> {
+  query(ids: ID[], tx?: Transaction): Promise<T[]> {
     if (!ids || ids.length === 0) {
       return Promise.resolve([])
     }
@@ -111,7 +112,7 @@ export class QueryRepository<T, ID> {
     if (this.sort && this.sort.length > 0) {
       sql = sql + " order by " + this.sort
     }
-    const db = ctx ? ctx : this.db
+    const db = tx ? tx: this.db
     return db.query<T>(sql, ids, this.map, this.bools)
   }
 }
@@ -119,14 +120,13 @@ export class QueryRepository<T, ID> {
 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>
+  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[]>
 }
 export interface Transaction extends Executor {
   commit(): Promise<void>
   rollback(): Promise<void>
-  end(): Promise<void>
 }
 export interface DB extends Executor {
   beginTransaction(): Promise<Transaction>
@@ -470,24 +470,34 @@ const getDurationInMilliseconds = (start: [number, number] | undefined) => {
 // tslint:disable-next-line:max-classes-per-file
 export class SqlWriter<T> {
   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 = version(attributes)
+    const x = buildMetadata(attributes)
     if (x) {
-      this.version = x.name
+      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, ctx?: Transaction): Promise<number> {
+  create(obj: T, tx?: Transaction): Promise<number> {
     let obj2 = 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()
+    }
     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) => {
+      const db = tx ? tx: this.db
+      return db.execute(stmt.query, stmt.params).catch((err) => {
         if (err && err.error === "duplicate") {
           return 0
         } else {
@@ -498,21 +508,27 @@ export class SqlWriter<T> {
       return Promise.resolve(-1)
     }
   }
-  update(obj: T, ctx?: Transaction): Promise<number> {
+  update(obj: T, tx?: Transaction): Promise<number> {
     let obj2 = 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()
+    }
     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)
+      const db = tx ? tx: this.db
+      return db.execute(stmt.query, stmt.params)
     } else {
       return Promise.resolve(-1)
     }
   }
-  patch(obj: Partial<T>, ctx?: any): Promise<number> {
-    return this.update(obj as any, ctx)
+  patch(obj: Partial<T>, tx?: Transaction): Promise<number> {
+    return this.update(obj as any, tx)
   }
 }
 export class CRUDRepository<T, ID> extends SqlWriter<T> {
@@ -521,7 +537,7 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
   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 = metadata(attributes)
+    const m = buildMetadata(attributes)
     this.primaryKeys = m.keys
     this.map = m.map
     this.bools = m.bools
@@ -534,18 +550,18 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
   metadata(): Attributes {
     return this.attributes
   }
-  all(ctx?: Transaction): Promise<T[]> {
+  all(tx?: Transaction): Promise<T[]> {
     const sql = `select * from ${this.table}`
-    const db = ctx ? ctx : this.db
+    const db = tx ? tx: this.db
     return db.query(sql, [], this.map, this.bools)
   }
-  load(id: ID, ctx?: Transaction): Promise<T | null> {
+  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 fn = this.fromDB
-    const db = ctx ? ctx : this.db
+    const db = tx ? tx: this.db
     if (fn) {
       return db.query<T>(stmt.query, stmt.params, this.map, this.bools).then((res) => {
         if (!res || res.length === 0) {
@@ -559,22 +575,22 @@ export class CRUDRepository<T, ID> extends SqlWriter<T> {
       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?: Transaction): 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.db.param, field)
     if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
-    const db = ctx ? ctx : this.db
+    const db = tx ? tx: this.db
     return db.query(stmt.query, stmt.params).then((res) => (!res || res.length === 0 ? false : true))
   }
-  delete(id: ID, ctx?: Transaction): Promise<number> {
+  delete(id: ID, tx?: 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)
+      const db = tx ? tx: this.db
+      return db.execute(stmt.query, stmt.params)
     } else {
-      return Promise.resolve(-1)
+      throw new Error("cannot build delete query by id")
     }
   }
 }
@@ -615,15 +631,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?: Transaction): Promise<number> {
+  create(obj: T, tx?: 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) {
-      const db = ctx ? ctx : this.db
-      return db.exec(stmt.query, stmt.params).catch((err) => {
+      const db = tx ? tx: this.db
+      return db.execute(stmt.query, stmt.params).catch((err) => {
         if (err && err.error === "duplicate") {
           return 0
         } else {
@@ -634,21 +650,21 @@ export class SqlSearchWriter<T, S> extends SearchBuilder<T, S> {
       return Promise.resolve(-1)
     }
   }
-  update(obj: T, ctx?: Transaction): Promise<number> {
+  update(obj: T, tx?: 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) {
-      const db = ctx ? ctx : this.db
-      return db.exec(stmt.query, stmt.params)
+      const db = tx ? tx: this.db
+      return db.execute(stmt.query, stmt.params)
     } else {
       return Promise.resolve(-1)
     }
   }
-  patch(obj: Partial<T>, ctx?: Transaction): Promise<number> {
-    return this.update(obj as any, ctx)
+  patch(obj: Partial<T>, tx?: Transaction): Promise<number> {
+    return this.update(obj as any, tx)
   }
 }
 // tslint:disable-next-line:max-classes-per-file
@@ -688,18 +704,18 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
   metadata(): Attributes {
     return this.attributes
   }
-  all(ctx?: Transaction): Promise<T[]> {
+  all(tx?: Transaction): Promise<T[]> {
     const sql = `select * from ${this.table}`
-    const db = ctx ? ctx : this.db
+    const db = tx ? tx: this.db
     return db.query(sql, [], this.map, this.bools)
   }
-  load(id: ID, ctx?: Transaction): Promise<T | null> {
+  load(id: ID, tx?: Transaction): 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
-    const db = ctx ? ctx : this.db
+    const db = tx ? tx: this.db
     if (fn) {
       return db.query<T>(stmt.query, stmt.params, this.map, this.bools).then((res) => {
         if (!res || res.length === 0) {
@@ -713,22 +729,22 @@ export class SqlRepository<T, ID, S> extends SqlSearchWriter<T, S> {
       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?: Transaction): 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)
-    if (!stmt) {
+    if (!stmt.query) {
       throw new Error("cannot build query by id")
     }
-    const db = ctx ? ctx : this.db
+    const db = tx ? tx: this.db
     return db.query(stmt.query, stmt.params).then((res) => (!res || res.length === 0 ? false : true))
   }
-  delete(id: ID, ctx?: Transaction): Promise<number> {
+  delete(id: ID, tx?: Transaction): Promise<number> {
     const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.param)
     if (stmt.query) {
-      const db = ctx ? ctx : this.db
-      return db.exec(stmt.query, stmt.params)
+      const db = tx ? tx: this.db
+      return db.execute(stmt.query, stmt.params)
     } else {
-      return Promise.resolve(-1)
+      throw new Error("cannot build delete query by id")
     }
   }
 }
@@ -764,7 +780,7 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
     total?: string,
   ) {
     super(query, table, attributes, provider, buildQ, fromDB, sort, q, excluding, buildSort, buildParam, total)
-    const m = metadata(attributes)
+    const m = buildMetadata(attributes)
     this.primaryKeys = m.keys
     this.map = m.map
     this.bools = m.bools
@@ -804,7 +820,7 @@ export class Query<T, ID, S> extends SearchBuilder<T, S> {
   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.query) {
+    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))