query-core 0.1.18 → 0.1.21

package/lib/services.js

@@ -14,6 +14,12 @@ var __extends = (this && this.__extends) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
+function useGet(table, q, attrs, param, fromDB) {
+  var l = new SqlLoader(table, q, attrs, param, fromDB);
+  return l.load;
+}
+exports.useGet = useGet;
+exports.useLoad = useGet;
 var SqlLoader = (function () {
   function SqlLoader(table, query, attrs, param, fromDB) {
     this.table = table;
@@ -139,8 +145,36 @@ var LogManager = (function () {
     return this.db.param(i);
   };
   LogManager.prototype.exec = function (sql, args, ctx) {
+    var _this = this;
     var t1 = new Date();
-    return this.db.exec(sql, args, ctx);
+    return this.db.exec(sql, args, ctx).then(function (v) {
+      setTimeout(function () {
+        if (_this.log) {
+          var d = diff(t1);
+          var obj = {};
+          if (_this.sql.length > 0) {
+            obj[_this.sql] = getString(sql, args);
+          }
+          if (_this.return.length > 0) {
+            obj[_this.return] = v;
+          }
+          obj[_this.duration] = d;
+          _this.log('query', obj);
+        }
+      }, 0);
+      return v;
+    }).catch(function (er) {
+      setTimeout(function () {
+        var d = diff(t1);
+        var obj = {};
+        if (_this.sql.length > 0) {
+          obj[_this.sql] = getString(sql, args);
+        }
+        obj[_this.duration] = d;
+        _this.error('error query: ' + buildString(er));
+      }, 0);
+      throw er;
+    });
   };
   LogManager.prototype.execBatch = function (statements, firstSuccess, ctx) {
     var _this = this;

package/package.json

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

package/src/batch.ts

@@ -26,6 +26,7 @@ export class SqlInserter<T> {
     }
   }
 }
+// tslint:disable-next-line:max-classes-per-file
 export class SqlUpdater<T> {
   version?: string;
   constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: (i: number) => string, public map?: (v: T) => T) {
@@ -51,6 +52,7 @@ export class SqlUpdater<T> {
     }
   }
 }
+// tslint:disable-next-line:max-classes-per-file
 export class SqlBatchInserter<T> {
   version?: string;
   constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: ((i: number) => string)|boolean, public map?: (v: T) => T) {
@@ -80,6 +82,7 @@ export class SqlBatchInserter<T> {
     }
   }
 }
+// tslint:disable-next-line:max-classes-per-file
 export class SqlBatchUpdater<T> {
   version?: string;
   constructor(public execBatch: (statements: Statement[]) => Promise<number>, public table: string, public attributes: Attributes, public param: (i: number) => string, protected notSkipInvalid?: boolean, public map?: (v: T) => T) {

package/src/index.ts

@@ -54,6 +54,7 @@ export interface Config {
 export class resource {
   static string?: boolean;
 }
+// tslint:disable-next-line:max-classes-per-file
 export class Loader<T> {
   map?: StringMap;
   constructor(public query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>, public sql: string, m?: StringMap, public bools?: Attribute[]) {

package/src/services.ts

@@ -1,4 +1,4 @@
-import {attributes, buildToDelete, buildToInsert, buildToUpdate, exist, metadata, select, toString, version} from './build';
+import {attributes, buildToDelete, buildToInsert, buildToUpdate, exist, metadata, select, version} from './build';
 import {Attribute, Attributes, Statement, StringMap} from './metadata';
 import {SearchResult} from './search';
 
@@ -7,6 +7,17 @@ export interface Filter {
   sort?: string;
   q?: string;
 }
+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>(table: string,
+  q: <K>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[], ctx?: any) => Promise<K[]>,
+  attrs: Attributes|string[],
+  param: (i: number) => string,
+  fromDB?: (v: T) => T): Load<T, ID> {
+  const l = new SqlLoader<T, ID>(table, q, attrs, param, fromDB);
+  return l.load;
+}
+export const useLoad = useGet;
 export class SqlLoader<T, ID> {
   primaryKeys: Attribute[];
   map?: StringMap;
@@ -170,7 +181,34 @@ export class LogManager implements ExtManager {
   }
   exec(sql: string, args?: any[], ctx?: any): Promise<number> {
     const t1 = new Date();
-    return this.db.exec(sql, args, ctx);
+    return this.db.exec(sql, args, ctx).then(v => {
+      setTimeout(() => {
+        if (this.log) {
+          const d = diff(t1);
+          const obj: SimpleMap = {} ;
+          if (this.sql.length > 0) {
+            obj[this.sql] = getString(sql, args);
+          }
+          if (this.return.length > 0) {
+            obj[this.return] = v;
+          }
+          obj[this.duration] = d;
+          this.log('query', obj);
+        }
+      }, 0);
+      return v;
+    }).catch(er => {
+      setTimeout(() => {
+        const d = diff(t1);
+        const obj: SimpleMap = {};
+        if (this.sql.length > 0) {
+          obj[this.sql] = getString(sql, args);
+        }
+        obj[this.duration] = d;
+        this.error('error query: ' + buildString(er));
+      }, 0);
+      throw er;
+    });
   }
   execBatch(statements: Statement[], firstSuccess?: boolean, ctx?: any): Promise<number> {
     const t1 = new Date();
@@ -416,8 +454,8 @@ export class SqlWriter<T, ID> extends SqlLoader<T, ID> {
       return Promise.resolve(0);
     }
   }
-  patch(obj: T, ctx?: any): Promise<number> {
-    return this.update(obj, ctx);
+  patch(obj: Partial<T>, ctx?: any): Promise<number> {
+    return this.update(obj as any, ctx);
   }
   delete(id: ID, ctx?: any): Promise<number> {
     const stmt = buildToDelete<ID>(id, this.table, this.primaryKeys, this.param);

package/tsconfig.json

@@ -13,6 +13,7 @@
     "experimentalDecorators": false,
     "removeComments": true,
     "lib": [
+      "DOM",
       "es7"
     ]
   },