query-core 0.1.10 → 0.1.14

package/lib/build.js

@@ -16,7 +16,7 @@ function select(obj, table, ks, buildParam, i) {
     i = 1;
   }
   if (ks.length === 1) {
-    var field = (ks[0].field ? ks[0].field : ks[0].name);
+    var field = (ks[0].column ? ks[0].column : ks[0].name);
     if (typeof obj === 'number') {
       var query = "select * from " + table + " where " + field + " = " + obj;
       return { query: query, params: [] };
@@ -32,7 +32,7 @@ function select(obj, table, ks, buildParam, i) {
     for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
       var k = ks_1[_i];
       if (k.name) {
-        var field = (k.field ? k.field : k.name);
+        var field = (k.column ? k.column : k.name);
         cols.push(field + " = " + buildParam(i++));
         args.push(obj[k.name]);
       }
@@ -53,7 +53,7 @@ function exist(obj, table, ks, buildParam, col, i) {
     col = '*';
   }
   if (ks.length === 1) {
-    var field = (ks[0].field ? ks[0].field : ks[0].name);
+    var field = (ks[0].column ? ks[0].column : ks[0].name);
     if (typeof obj === 'number') {
       var query = "select " + col + " from " + table + " where " + field + " = " + obj;
       return { query: query, params: [] };
@@ -69,7 +69,7 @@ function exist(obj, table, ks, buildParam, col, i) {
     for (var _i = 0, ks_2 = ks; _i < ks_2.length; _i++) {
       var k = ks_2[_i];
       if (k.name) {
-        var field = (k.field ? k.field : k.name);
+        var field = (k.column ? k.column : k.name);
         cols.push(field + " = " + buildParam(i++));
         args.push(obj[k.name]);
       }
@@ -87,7 +87,7 @@ function buildToDelete(obj, table, ks, buildParam, i) {
     i = 1;
   }
   if (ks.length === 1) {
-    var field = (ks[0].field ? ks[0].field : ks[0].name);
+    var field = (ks[0].column ? ks[0].column : ks[0].name);
     if (typeof obj === 'number') {
       var query = "delete from " + table + " where " + field + " = " + obj;
       return { query: query, params: [] };
@@ -103,7 +103,7 @@ function buildToDelete(obj, table, ks, buildParam, i) {
     for (var _i = 0, ks_3 = ks; _i < ks_3.length; _i++) {
       var k = ks_3[_i];
       if (k.name) {
-        var field = (k.field ? k.field : k.name);
+        var field = (k.column ? k.column : k.name);
         cols.push(field + " = " + buildParam(i++));
         args.push(obj[k.name]);
       }
@@ -145,7 +145,7 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
         v = attr.default;
       }
       if (v !== undefined && v != null) {
-        var field = (attr.field ? attr.field : k);
+        var field = (attr.column ? attr.column : k);
         cols.push(field);
         if (k === ver) {
           isVersion = true;
@@ -191,7 +191,7 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
   }
   if (!isVersion && ver && ver.length > 0) {
     var attr = attrs[ver];
-    var field = (attr.field ? attr.field : ver);
+    var field = (attr.column ? attr.column : ver);
     cols.push(field);
     values.push("" + 1);
   }
@@ -230,7 +230,7 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
       var k = ks_5[_i];
       var attr = attrs[k];
       if (attr && !attr.ignored && !attr.noinsert) {
-        var field = (attr.field ? attr.field : k);
+        var field = (attr.column ? attr.column : k);
         cols.push(field);
       }
     }
@@ -311,7 +311,7 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
             v = attr.default;
           }
           if (v !== undefined && v != null) {
-            var field = (attr.field ? attr.field : k);
+            var field = (attr.column ? attr.column : k);
             cols.push(field);
             if (k === ver) {
               isVersion = true;
@@ -357,7 +357,7 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
       }
       if (!isVersion && ver && ver.length > 0) {
         var attr = attrs[ver];
-        var field = (attr.field ? attr.field : ver);
+        var field = (attr.column ? attr.column : ver);
         cols.push(field);
         values.push("" + 1);
       }
@@ -410,7 +410,7 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
           pks.push(attr);
         }
         else if (!attr.noupdate) {
-          var field = (attr.field ? attr.field : k);
+          var field = (attr.column ? attr.column : k);
           var x = void 0;
           if (v == null) {
             x = 'null';
@@ -460,7 +460,7 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
     }
     else {
       var attr = attrs[na];
-      var field = (attr.field ? attr.field : pk.name);
+      var field = (attr.column ? attr.column : pk.name);
       var x = void 0;
       if (v == null) {
         x = 'null';
@@ -495,7 +495,7 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
     if (typeof v === 'number' && !isNaN(v)) {
       var attr = attrs[ver];
       if (attr) {
-        var field = (attr.field ? attr.field : ver);
+        var field = (attr.column ? attr.column : ver);
         colSet.push(field + "=" + (1 + v));
         colQuery.push(field + "=" + v);
       }
@@ -541,7 +541,7 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
         var attr = attrs[k];
         attr.name = k;
         if (attr && !attr.ignored && !attr.key && !attr.version && !attr.noupdate) {
-          var field = (attr.field ? attr.field : k);
+          var field = (attr.column ? attr.column : k);
           var x = void 0;
           if (v == null) {
             x = 'null';
@@ -591,7 +591,7 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
       }
       else {
         var attr = attrs[na];
-        var field = (attr.field ? attr.field : pk.name);
+        var field = (attr.column ? attr.column : pk.name);
         var x = void 0;
         if (v == null) {
           x = 'null';
@@ -633,7 +633,7 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
         if (typeof v === 'number' && !isNaN(v)) {
           var attr = attrs[ver];
           if (attr) {
-            var field = (attr.field ? attr.field : ver);
+            var field = (attr.column ? attr.column : ver);
             colSet.push(field + "=" + (1 + v));
             colQuery.push(field + "=" + v);
           }
@@ -694,7 +694,7 @@ function buildMap(attrs) {
     var k = ks_13[_i];
     var attr = attrs[k];
     attr.name = k;
-    var field = (attr.field ? attr.field : k);
+    var field = (attr.column ? attr.column : k);
     var s = field.toLowerCase();
     if (s !== k) {
       mp[s] = k;
@@ -727,7 +727,7 @@ function metadata(attrs) {
     if (attr.version) {
       m.version = k;
     }
-    var field = (attr.field ? attr.field : k);
+    var field = (attr.column ? attr.column : k);
     var s = field.toLowerCase();
     if (s !== k) {
       mp[s] = k;
@@ -747,7 +747,7 @@ function attributes(attrs, isKey) {
   var ks = [];
   for (var _i = 0, attrs_1 = attrs; _i < attrs_1.length; _i++) {
     var s = attrs_1[_i];
-    var a = { name: s, field: s, key: isKey };
+    var a = { name: s, column: s, key: isKey };
     ks.push(a);
   }
   return ks;

package/lib/index.js

@@ -4,12 +4,6 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 var services_1 = require("./services");
-exports.createGenericSearchRepository = services_1.createSqlSearchWriter;
-exports.createGenericSearchService = services_1.createSqlSearchWriter;
-exports.createRepository = services_1.createSqlSearchWriter;
-exports.createService = services_1.createSqlSearchWriter;
-exports.createGenericRepository = services_1.createSqlWriter;
-exports.createGenericService = services_1.createSqlWriter;
 exports.SqlLoadRepository = services_1.SqlLoader;
 exports.SqlViewRepository = services_1.SqlLoader;
 exports.SqlLoadService = services_1.SqlLoader;

package/lib/query.js

@@ -38,8 +38,8 @@ function getField(name, map) {
   if (typeof x === 'string') {
     return x;
   }
-  if (x.field) {
-    return x.field;
+  if (x.column) {
+    return x.column;
   }
   return name;
 }
@@ -106,7 +106,7 @@ function buildQuery(filter, bparam, table, attrs, sort, fields, sq, strExcluding
     if (v !== undefined && v != null) {
       var attr = attrs[key];
       if (attr) {
-        field = (attr.field ? attr.field : key);
+        field = (attr.column ? attr.column : key);
         if (typeof v === 'string') {
           if (v.length !== 0) {
             if (attr.q) {
@@ -280,7 +280,7 @@ function getId(attrs) {
     var key = qkeys_2[_i];
     var attr = attrs[key];
     if (attr.key) {
-      var field = (attr.field ? attr.field : key);
+      var field = (attr.column ? attr.column : key);
       return field;
     }
   }
@@ -296,7 +296,7 @@ function buildFieldsByAttributes(attrs, fields) {
     var f = fields_1[_i];
     var attr = attrs[f];
     if (attr) {
-      var field = (attr.field ? attr.field : f);
+      var field = (attr.column ? attr.column : f);
       cols.push(field);
     }
   }

package/lib/services.js

@@ -67,7 +67,7 @@ var SqlLoader = (function () {
     }
   };
   SqlLoader.prototype.exist = function (id, ctx) {
-    var field = (this.primaryKeys[0].field ? this.primaryKeys[0].field : this.primaryKeys[0].name);
+    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) {
       throw new Error('cannot build query by id');
@@ -91,18 +91,14 @@ var SqlSearchLoader = (function (_super) {
   return SqlSearchLoader;
 }(SqlLoader));
 exports.SqlSearchLoader = SqlSearchLoader;
-function createSqlWriter(table, manager, attrs, buildParam, toDB, fromDB) {
-  var writer = new SqlWriter(table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-  return writer;
-}
-exports.createSqlWriter = createSqlWriter;
 var SqlWriter = (function (_super) {
   __extends(SqlWriter, _super);
-  function SqlWriter(table, query, exec, attrs, buildParam, toDB, fromDB) {
-    var _this = _super.call(this, table, query, attrs, buildParam, fromDB) || this;
-    _this.exec = exec;
+  function SqlWriter(manager, table, attrs, toDB, fromDB) {
+    var _this = _super.call(this, table, manager.query, attrs, manager.param, fromDB) || this;
     _this.toDB = toDB;
     var x = build_1.version(attrs);
+    _this.exec = manager.exec;
+    _this.execBatch = manager.execBatch;
     if (x) {
       _this.version = x.name;
     }
@@ -162,8 +158,8 @@ var SqlWriter = (function (_super) {
 exports.SqlWriter = SqlWriter;
 var SqlSearchWriter = (function (_super) {
   __extends(SqlSearchWriter, _super);
-  function SqlSearchWriter(find, table, query, exec, attrs, buildParam, toDB, fromDB) {
-    var _this = _super.call(this, table, query, exec, attrs, buildParam, toDB, fromDB) || this;
+  function SqlSearchWriter(find, manager, table, attrs, toDB, fromDB) {
+    var _this = _super.call(this, manager, table, attrs, toDB, fromDB) || this;
     _this.find = find;
     _this.search = _this.search.bind(_this);
     return _this;
@@ -174,8 +170,3 @@ var SqlSearchWriter = (function (_super) {
   return SqlSearchWriter;
 }(SqlWriter));
 exports.SqlSearchWriter = SqlSearchWriter;
-function createSqlSearchWriter(find, table, manager, attrs, buildParam, toDB, fromDB) {
-  var writer = new SqlSearchWriter(find, table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-  return writer;
-}
-exports.createSqlSearchWriter = createSqlSearchWriter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-core",
-  "version": "0.1.10",
+  "version": "0.1.14",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
@@ -21,6 +21,7 @@
   },
   "keywords": [
     "query",
+    "query-core",
     "sql"
   ]
 }

package/src/build.ts

@@ -15,7 +15,7 @@ export function select<T>(obj: T, table: string, ks: Attribute[], buildParam: (i
     i = 1;
   }
   if (ks.length === 1) {
-    const field = (ks[0].field ? ks[0].field : ks[0].name);
+    const field = (ks[0].column ? ks[0].column : ks[0].name);
     if (typeof obj === 'number') {
       const query = `select * from ${table} where ${field} = ${obj}`;
       return { query, params: [] };
@@ -28,7 +28,7 @@ export function select<T>(obj: T, table: string, ks: Attribute[], buildParam: (i
     const args: any[] = [];
     for (const k of ks) {
       if (k.name) {
-        const field = (k.field ? k.field : k.name);
+        const field = (k.column ? k.column : k.name);
         cols.push(`${field} = ${buildParam(i++)}`);
         args.push((obj as any)[k.name]);
       }
@@ -47,7 +47,7 @@ export function exist<T>(obj: T, table: string, ks: Attribute[], buildParam: (i:
     col = '*';
   }
   if (ks.length === 1) {
-    const field = (ks[0].field ? ks[0].field : ks[0].name);
+    const field = (ks[0].column ? ks[0].column : ks[0].name);
     if (typeof obj === 'number') {
       const query = `select ${col} from ${table} where ${field} = ${obj}`;
       return { query, params: [] };
@@ -60,7 +60,7 @@ export function exist<T>(obj: T, table: string, ks: Attribute[], buildParam: (i:
     const args: any[] = [];
     for (const k of ks) {
       if (k.name) {
-        const field = (k.field ? k.field : k.name);
+        const field = (k.column ? k.column : k.name);
         cols.push(`${field} = ${buildParam(i++)}`);
         args.push((obj as any)[k.name]);
       }
@@ -76,7 +76,7 @@ export function buildToDelete<T>(obj: T, table: string, ks: Attribute[], buildPa
     i = 1;
   }
   if (ks.length === 1) {
-    const field = (ks[0].field ? ks[0].field : ks[0].name);
+    const field = (ks[0].column ? ks[0].column : ks[0].name);
     if (typeof obj === 'number') {
       const query = `delete from ${table} where ${field} = ${obj}`;
       return { query, params: [] };
@@ -89,7 +89,7 @@ export function buildToDelete<T>(obj: T, table: string, ks: Attribute[], buildPa
     const args: any[] = [];
     for (const k of ks) {
       if (k.name) {
-        const field = (k.field ? k.field : k.name);
+        const field = (k.column ? k.column : k.name);
         cols.push(`${field} = ${buildParam(i++)}`);
         args.push((obj as any)[k.name]);
       }
@@ -126,7 +126,7 @@ export function buildToInsert<T>(obj: T, table: string, attrs: Attributes, build
         v = attr.default;
       }
       if (v !== undefined && v != null) {
-        const field = (attr.field ? attr.field : k);
+        const field = (attr.column ? attr.column : k);
         cols.push(field);
         if (k === ver) {
           isVersion = true;
@@ -165,7 +165,7 @@ export function buildToInsert<T>(obj: T, table: string, attrs: Attributes, build
   }
   if (!isVersion && ver && ver.length > 0) {
     const attr = attrs[ver];
-    const field = (attr.field ? attr.field : ver);
+    const field = (attr.column ? attr.column : ver);
     cols.push(field);
     values.push(`${1}`);
   }
@@ -199,7 +199,7 @@ export function buildToInsertBatch<T>(objs: T[], table: string, attrs: Attribute
     for (const k of ks) {
       const attr = attrs[k];
       if (attr && !attr.ignored && !attr.noinsert) {
-        const field = (attr.field ? attr.field : k);
+        const field = (attr.column ? attr.column : k);
         cols.push(field);
       }
     }
@@ -268,7 +268,7 @@ export function buildToInsertBatch<T>(objs: T[], table: string, attrs: Attribute
             v = attr.default;
           }
           if (v !== undefined && v != null) {
-            const field = (attr.field ? attr.field : k);
+            const field = (attr.column ? attr.column : k);
             cols.push(field);
             if (k === ver) {
               isVersion = true;
@@ -307,7 +307,7 @@ export function buildToInsertBatch<T>(objs: T[], table: string, attrs: Attribute
       }
       if (!isVersion && ver && ver.length > 0) {
         const attr = attrs[ver];
-        const field = (attr.field ? attr.field : ver);
+        const field = (attr.column ? attr.column : ver);
         cols.push(field);
         values.push(`${1}`);
       }
@@ -354,7 +354,7 @@ export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, build
         if (attr.key) {
           pks.push(attr);
         } else if (!attr.noupdate) {
-          const field = (attr.field ? attr.field : k);
+          const field = (attr.column ? attr.column : k);
           let x: string;
           if (v == null) {
             x = 'null';
@@ -395,7 +395,7 @@ export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, build
       return undefined;
     } else {
       const attr = attrs[na];
-      const field = (attr.field ? attr.field : pk.name);
+      const field = (attr.column ? attr.column : pk.name);
       let x: string;
       if (v == null) {
         x = 'null';
@@ -425,7 +425,7 @@ export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, build
     if (typeof v === 'number' && !isNaN(v)) {
       const attr = attrs[ver];
       if (attr) {
-        const field = (attr.field ? attr.field : ver);
+        const field = (attr.column ? attr.column : ver);
         colSet.push(`${field}=${(1 + v)}`);
         colQuery.push(`${field}=${v}`);
       }
@@ -465,7 +465,7 @@ export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attribute
         const attr = attrs[k];
         attr.name = k;
         if (attr && !attr.ignored && !attr.key && !attr.version && !attr.noupdate) {
-          const field = (attr.field ? attr.field : k);
+          const field = (attr.column ? attr.column : k);
           let x: string;
           if (v == null) {
             x = 'null';
@@ -506,7 +506,7 @@ export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attribute
         valid = false;
       } else {
         const attr = attrs[na];
-        const field = (attr.field ? attr.field : pk.name);
+        const field = (attr.column ? attr.column : pk.name);
         let x: string;
         if (v == null) {
           x = 'null';
@@ -542,7 +542,7 @@ export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attribute
         if (typeof v === 'number' && !isNaN(v)) {
           const attr = attrs[ver];
           if (attr) {
-            const field = (attr.field ? attr.field : ver);
+            const field = (attr.column ? attr.column : ver);
             colSet.push(`${field}=${(1 + v)}`);
             colQuery.push(`${field}=${v}`);
           }
@@ -595,7 +595,7 @@ export function buildMap(attrs: Attributes): StringMap {
   for (const k of ks) {
     const attr = attrs[k];
     attr.name = k;
-    const field = (attr.field ? attr.field : k);
+    const field = (attr.column ? attr.column : k);
     const s = field.toLowerCase();
     if (s !== k) {
       mp[s] = k;
@@ -633,7 +633,7 @@ export function metadata(attrs: Attributes): Metadata {
     if (attr.version) {
       m.version = k;
     }
-    const field = (attr.field ? attr.field : k);
+    const field = (attr.column ? attr.column : k);
     const s = field.toLowerCase();
     if (s !== k) {
       mp[s] = k;
@@ -651,7 +651,7 @@ export function metadata(attrs: Attributes): Metadata {
 export function attributes(attrs: string[], isKey?: boolean) {
   const ks: Attribute[] = [];
   for (const s of attrs) {
-    const a: Attribute = {name: s, field: s, key: isKey};
+    const a: Attribute = {name: s, column: s, key: isKey};
     ks.push(a);
   }
   return ks;

package/src/index.ts

@@ -1,5 +1,5 @@
 import {Attribute, StringMap} from './metadata';
-import {createSqlSearchWriter, createSqlWriter, SqlLoader, SqlSearchLoader, SqlSearchWriter, SqlWriter} from './services';
+import {SqlLoader, SqlSearchLoader, SqlSearchWriter, SqlWriter} from './services';
 export {SqlLoader as SqlLoadRepository};
 export {SqlLoader as SqlViewRepository};
 export {SqlWriter as SqlGenericRepository};
@@ -23,12 +23,6 @@ export {SqlSearchWriter as SqlRepository};
 export {SqlSearchWriter as SqlService};
 export {SqlSearchWriter as Repository};
 export {SqlSearchWriter as Service};
-export {createSqlWriter as createGenericRepository};
-export {createSqlWriter as createGenericService};
-export {createSqlSearchWriter as createGenericSearchRepository};
-export {createSqlSearchWriter as createGenericSearchService};
-export {createSqlSearchWriter as createRepository};
-export {createSqlSearchWriter as createService};
 
 export * from './metadata';
 export * from './build';

package/src/metadata.ts

@@ -19,9 +19,9 @@ export interface Statement {
 }
 
 export type DataType = 'ObjectId' | 'date' | 'datetime' | 'time'
-    | 'boolean' | 'number' | 'integer' | 'string' | 'text'
-    | 'object' | 'array' | 'binary'
-    | 'primitives' | 'booleans' | 'numbers' | 'integers' | 'strings' | 'dates' | 'datetimes' | 'times';
+  | 'boolean' | 'number' | 'integer' | 'string' | 'text'
+  | 'object' | 'array' | 'binary'
+  | 'primitives' | 'booleans' | 'numbers' | 'integers' | 'strings' | 'dates' | 'datetimes' | 'times';
 export type FormatType = 'currency' | 'percentage' | 'email' | 'url' | 'phone' | 'fax' | 'ipv4' | 'ipv6';
 export type MatchType = 'equal' | 'prefix' | 'contain' | 'max' | 'min'; // contain: default for string, min: default for Date, number
 
@@ -29,28 +29,41 @@ export interface Model {
   name?: string;
   attributes: Attributes;
   source?: string;
+  table?: string;
+  collection?: string;
+  model?: any;
+  schema?: any;
 }
 export interface Attribute {
   name?: string;
   field?: string;
+  column?: string;
   type?: DataType;
   format?: FormatType;
   required?: boolean;
   match?: MatchType;
-  default?: string|number|Date;
+  default?: string|number|Date|boolean;
   key?: boolean;
+  unique?: boolean;
+  enum?: string[] | number[];
   q?: boolean;
   noinsert?: boolean;
   noupdate?: boolean;
+  nopatch?: boolean;
   version?: boolean;
-  ignored?: boolean;
   length?: number;
   min?: number;
   max?: number;
   gt?: number;
   lt?: number;
-  exp?: RegExp|string;
+  precision?: number;
+  scale?: number;
+  exp?: RegExp | string;
   code?: string;
+  noformat?: boolean;
+  ignored?: boolean;
+  jsonField?: string;
+  link?: string;
   typeof?: Attributes;
   true?: string|number;
   false?: string|number;

package/src/query.ts

@@ -38,8 +38,8 @@ export function getField(name: string, map?: Attributes|StringMap): string {
   if (typeof x === 'string') {
     return x;
   }
-  if (x.field) {
-    return x.field;
+  if (x.column) {
+    return x.column;
   }
   return name;
 }
@@ -100,7 +100,7 @@ export function buildQuery<S>(filter: S, bparam: LikeType|((i: number ) => strin
     if (v !== undefined && v != null) {
       const attr: Attribute = attrs[key];
       if (attr) {
-        field = (attr.field ? attr.field : key);
+        field = (attr.column ? attr.column : key);
         if (typeof v === 'string') {
           if (v.length !== 0) {
             if (attr.q) {
@@ -247,7 +247,7 @@ export function getId(attrs: Attributes): string|undefined {
   for (const key of qkeys) {
     const attr = attrs[key];
     if (attr.key) {
-      const field = (attr.field ? attr.field : key);
+      const field = (attr.column ? attr.column : key);
       return field;
     }
   }
@@ -261,7 +261,7 @@ export function buildFieldsByAttributes(attrs: Attributes, fields?: string[]): s
   for (const f of fields) {
     const attr = attrs[f];
     if (attr) {
-      const field = (attr.field ? attr.field : f);
+      const field = (attr.column ? attr.column : f);
       cols.push(field);
     }
   }

package/src/services.ts

@@ -15,8 +15,8 @@ export class SqlLoader<T, ID> {
   constructor(public table: string,
     public query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<T[]>,
     attrs: Attributes|string[],
-    protected param: (i: number) => string,
-    protected fromDB?: (v: T) => T) {
+    public param: (i: number) => string,
+    public fromDB?: (v: T) => T) {
     if (Array.isArray(attrs)) {
       this.primaryKeys = attributes(attrs);
       this.attributes = {} as any;
@@ -61,7 +61,7 @@ export class SqlLoader<T, ID> {
     }
   }
   exist(id: ID, ctx?: any): Promise<boolean> {
-    const field = (this.primaryKeys[0].field ? this.primaryKeys[0].field : this.primaryKeys[0].name);
+    const field = (this.primaryKeys[0].column ? this.primaryKeys[0].column : this.primaryKeys[0].name);
     const stmt = exist<ID>(id, this.table, this.primaryKeys, this.param, field);
     if (!stmt) {
       throw new Error('cannot build query by id');
@@ -85,31 +85,31 @@ export class SqlSearchLoader<T, ID, S extends Filter> extends SqlLoader<T, ID> {
   }
 }
 export interface Manager {
+  driver: string;
+  param(i: number): string;
   exec(sql: string, args?: any[], ctx?: any): Promise<number>;
   execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>;
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>;
 }
-export function createSqlWriter<T, ID>(table: string,
-    manager: Manager,
-    attrs: Attributes,
-    buildParam: (i: number) => string,
-    toDB?: (v: T) => T,
-    fromDB?: (v: T) => T) {
-  const writer = new SqlWriter<T, ID>(table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-  return writer;
+export interface DB {
+  driver: string;
+  param(i: number): string;
+  exec(sql: string, args?: any[], ctx?: any): Promise<number>;
+  execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number>;
+  query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any): Promise<T[]>;
 }
-
 export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
   version?: string;
-  constructor(table: string,
-    query: (sql: string, args?: any[], m?: StringMap, ctx?: any) => Promise<T[]>,
-    public exec: (sql: string, args?: any[], ctx?: any) => Promise<number>,
+  exec: (sql: string, args?: any[], ctx?: any) => Promise<number>;
+  execBatch: (statements: Statement[], firstSuccess?: boolean, ctx?: any) => Promise<number>;
+  constructor(manager: Manager, table: string,
     attrs: Attributes,
-    buildParam: (i: number) => string,
-    protected toDB?: (v: T) => T,
+    public toDB?: (v: T) => T,
     fromDB?: (v: T) => T) {
-    super(table, query, attrs, buildParam, fromDB);
+    super(table, manager.query, attrs, manager.param, fromDB);
     const x = version(attrs);
+    this.exec = manager.exec;
+    this.execBatch = manager.execBatch;
     if (x) {
       this.version = x.name;
     }
@@ -163,28 +163,15 @@ export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
 export class SqlSearchWriter<T, ID, S extends Filter> extends SqlWriter<T, ID> {
   constructor(
       protected find: (s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>,
+      manager: Manager,
       table: string,
-      query: (sql: string, args?: any[], m?: StringMap, ctx?: any) => Promise<T[]>,
-      exec: (sql: string, args?: any[], ctx?: any) => Promise<number>,
       attrs: Attributes,
-      buildParam: (i: number) => string,
       toDB?: (v: T) => T,
       fromDB?: (v: T) => T) {
-    super(table, query, exec, attrs, buildParam, toDB, fromDB);
+    super(manager, table, attrs, toDB, fromDB);
     this.search = this.search.bind(this);
   }
   search(s: S, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>> {
     return this.find(s, limit, offset, fields);
   }
 }
-export function createSqlSearchWriter<T, ID, S extends Filter>(
-  find: (s: S, limit?: number, offset?: number|string, fields?: string[]) => Promise<SearchResult<T>>,
-  table: string,
-  manager: Manager,
-  attrs: Attributes,
-  buildParam: (i: number) => string,
-  toDB?: (v: T) => T,
-  fromDB?: (v: T) => T) {
-const writer = new SqlSearchWriter<T, ID, S>(find, table, manager.query, manager.exec, attrs, buildParam, toDB, fromDB);
-return writer;
-}