query-core 0.1.27 → 0.1.29

package/README.md

@@ -1 +1 @@
-# query
+# query-core

package/lib/batch.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
 var SqlInserter = (function () {
-  function SqlInserter(exec, table, attributes, param, map) {
+  function SqlInserter(exec, table, attributes, param, oneIfSuccess, map) {
     this.exec = exec;
     this.table = table;
     this.attributes = attributes;
     this.param = param;
+    this.oneIfSuccess = oneIfSuccess;
     this.map = map;
     this.write = this.write.bind(this);
     var x = build_1.version(attributes);
@@ -24,7 +25,12 @@ var SqlInserter = (function () {
     }
     var stmt = build_1.buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
     if (stmt) {
-      return this.exec(stmt.query, stmt.params);
+      if (this.oneIfSuccess) {
+        return this.exec(stmt.query, stmt.params).then(function (ct) { return ct > 0 ? 1 : 0; });
+      }
+      else {
+        return this.exec(stmt.query, stmt.params);
+      }
     }
     else {
       return Promise.resolve(0);
@@ -34,11 +40,12 @@ var SqlInserter = (function () {
 }());
 exports.SqlInserter = SqlInserter;
 var SqlUpdater = (function () {
-  function SqlUpdater(exec, table, attributes, param, map) {
+  function SqlUpdater(exec, table, attributes, param, oneIfSuccess, map) {
     this.exec = exec;
     this.table = table;
     this.attributes = attributes;
     this.param = param;
+    this.oneIfSuccess = oneIfSuccess;
     this.map = map;
     this.write = this.write.bind(this);
     var x = build_1.version(attributes);
@@ -56,7 +63,12 @@ var SqlUpdater = (function () {
     }
     var stmt = build_1.buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
     if (stmt) {
-      return this.exec(stmt.query, stmt.params);
+      if (this.oneIfSuccess) {
+        return this.exec(stmt.query, stmt.params).then(function (ct) { return ct > 0 ? 1 : 0; });
+      }
+      else {
+        return this.exec(stmt.query, stmt.params);
+      }
     }
     else {
       return Promise.resolve(0);
@@ -66,11 +78,12 @@ var SqlUpdater = (function () {
 }());
 exports.SqlUpdater = SqlUpdater;
 var SqlBatchInserter = (function () {
-  function SqlBatchInserter(exec, table, attributes, param, map) {
+  function SqlBatchInserter(exec, table, attributes, param, oneIfSuccess, map) {
     this.exec = exec;
     this.table = table;
     this.attributes = attributes;
     this.param = param;
+    this.oneIfSuccess = oneIfSuccess;
     this.map = map;
     this.write = this.write.bind(this);
     var x = build_1.version(attributes);
@@ -93,7 +106,12 @@ var SqlBatchInserter = (function () {
     }
     var stmt = build_1.buildToInsertBatch(list, this.table, this.attributes, this.param, this.version);
     if (stmt) {
-      return this.exec(stmt.query, stmt.params);
+      if (this.oneIfSuccess) {
+        return this.exec(stmt.query, stmt.params).then(function (ct) { return objs.length; });
+      }
+      else {
+        return this.exec(stmt.query, stmt.params);
+      }
     }
     else {
       return Promise.resolve(0);
@@ -103,11 +121,12 @@ var SqlBatchInserter = (function () {
 }());
 exports.SqlBatchInserter = SqlBatchInserter;
 var SqlBatchUpdater = (function () {
-  function SqlBatchUpdater(execBatch, table, attributes, param, notSkipInvalid, map) {
+  function SqlBatchUpdater(execBatch, table, attributes, param, oneIfSuccess, notSkipInvalid, map) {
     this.execBatch = execBatch;
     this.table = table;
     this.attributes = attributes;
     this.param = param;
+    this.oneIfSuccess = oneIfSuccess;
     this.notSkipInvalid = notSkipInvalid;
     this.map = map;
     this.write = this.write.bind(this);
@@ -131,7 +150,12 @@ var SqlBatchUpdater = (function () {
     }
     var stmts = build_1.buildToUpdateBatch(list, this.table, this.attributes, this.param, this.notSkipInvalid);
     if (stmts && stmts.length > 0) {
-      return this.execBatch(stmts);
+      if (this.oneIfSuccess) {
+        return this.execBatch(stmts).then(function (ct) { return stmts.length; });
+      }
+      else {
+        return this.execBatch(stmts);
+      }
     }
     else {
       return Promise.resolve(0);
@@ -190,7 +214,7 @@ var StreamInserter = (function () {
         return this.exec(stmt.query, stmt.params).then(function (r) {
           _this.list = [];
           return total_1;
-        });
+        }); F
       }
       else {
         return Promise.resolve(0);

package/lib/search.js

@@ -1,57 +1,63 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 function buildFromQuery(query, sql, params, limit, offset, mp, bools, provider, totalCol) {
-  if (!limit || limit <= 0) {
-    return query(sql, params, mp, bools).then(function (list) {
-      var total = (list ? list.length : undefined);
-      return { list: list, total: total };
-    });
-  }
-  else {
-    if (provider === exports.oracle) {
-      if (!totalCol || totalCol.length === 0) {
-        totalCol = 'total';
-      }
-      var sql2 = buildPagingQueryForOracle(sql, limit, offset, totalCol);
-      return queryAndCount(query, sql2, params, totalCol, mp, bools);
+    if (!limit || limit <= 0) {
+        return query(sql, params, mp, bools).then(function (list) {
+            var total = (list ? list.length : undefined);
+            return { list: list, total: total };
+        });
     }
     else {
-      var sql2 = buildPagingQuery(sql, limit, offset);
-      var countQuery = buildCountQuery(sql);
-      var resultPromise = query(sql2, params, mp, bools);
-      var countPromise = query(countQuery, params).then(function (r) {
-        if (!r || r.length === 0) {
-          return 0;
+        if (provider === exports.oracle) {
+            if (!totalCol || totalCol.length === 0) {
+                totalCol = 'total';
+            }
+            var sql2 = buildPagingQueryForOracle(sql, limit, offset, totalCol);
+            return queryAndCount(query, sql2, params, totalCol, mp, bools);
         }
         else {
-          var r0 = r[0];
-          var keys = Object.keys(r0);
-          return r0[keys[0]];
+            var sql2 = buildPagingQuery(sql, limit, offset);
+            var countQuery = buildCountQuery(sql);
+            var resultPromise = query(sql2, params, mp, bools);
+            var countPromise = query(countQuery, params).then(function (r) {
+                if (!r || r.length === 0) {
+                    return 0;
+                }
+                else {
+                    var r0 = r[0];
+                    var keys = Object.keys(r0);
+                    return r0[keys[0]];
+                }
+            });
+            return Promise.all([resultPromise, countPromise]).then(function (r) {
+                var list = r[0], total = r[1];
+                if (typeof total === 'string' && !isNaN(total)) {
+                    var t = parseInt(total, 10);
+                    return { list: list, total: t };
+                }
+                else {
+                    return { list: list, total: total };
+                }
+            });
         }
-      });
-      return Promise.all([resultPromise, countPromise]).then(function (r) {
-        var list = r[0], total = r[1];
-        return { list: list, total: total };
-      });
     }
-  }
 }
 exports.buildFromQuery = buildFromQuery;
 function queryAndCount(query, sql, params, total, mp, bools) {
-  if (!total || total.length === 0) {
-    total = 'total';
-  }
-  return query(sql, params, mp, bools).then(function (list) {
-    if (!list || list.length === 0) {
-      return { list: [], total: 0 };
-    }
-    var t = list[0][total];
-    for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
-      var obj = list_1[_i];
-      delete obj[total];
-    }
-    return { list: list, total: t };
-  });
+    if (!total || total.length === 0) {
+        total = 'total';
+    }
+    return query(sql, params, mp, bools).then(function (list) {
+        if (!list || list.length === 0) {
+            return { list: [], total: 0 };
+        }
+        var t = list[0][total];
+        for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
+            var obj = list_1[_i];
+            delete obj[total];
+        }
+        return { list: list, total: t };
+    });
 }
 exports.queryAndCount = queryAndCount;
 exports.oracle = 'oracle';
@@ -60,70 +66,70 @@ var S = 'SELECT';
 var d = ' distinct ';
 var D = ' DISTINCT ';
 function buildPagingQuery(sql, limit, offset, provider) {
-  if (limit === undefined || limit == null) {
-    limit = 0;
-  }
-  if (offset === undefined || offset == null) {
-    offset = 0;
-  }
-  if (provider !== exports.oracle) {
-    return sql + " limit " + limit + " offset " + offset;
-  }
-  else {
-    return buildPagingQueryForOracle(sql, limit, offset);
-  }
+    if (limit === undefined || limit == null) {
+        limit = 0;
+    }
+    if (offset === undefined || offset == null) {
+        offset = 0;
+    }
+    if (provider !== exports.oracle) {
+        return sql + " limit " + limit + " offset " + offset;
+    }
+    else {
+        return buildPagingQueryForOracle(sql, limit, offset);
+    }
 }
 exports.buildPagingQuery = buildPagingQuery;
 function buildPagingQueryForOracle(sql, limit, offset, total) {
-  if (!total || total.length === 0) {
-    total = 'total';
-  }
-  if (!offset) {
-    offset = 0;
-  }
-  var l = d.length;
-  var i = sql.indexOf(d);
-  if (i < 0) {
-    i = sql.indexOf(D);
-  }
-  if (i < 0) {
-    l = S.length;
-    i = sql.indexOf(s);
-  }
-  if (i < 0) {
-    i = sql.indexOf(S);
-  }
-  if (i >= 0) {
-    return sql.substr(0, l) + " count(*) over() as " + total + ", " + sql.substr(l) + " offset " + offset + " rows fetch next " + limit + " rows only";
-  }
-  else {
-    return sql + " offset " + offset + " rows fetch next " + limit + " rows only";
-  }
+    if (!total || total.length === 0) {
+        total = 'total';
+    }
+    if (!offset) {
+        offset = 0;
+    }
+    var l = d.length;
+    var i = sql.indexOf(d);
+    if (i < 0) {
+        i = sql.indexOf(D);
+    }
+    if (i < 0) {
+        l = S.length;
+        i = sql.indexOf(s);
+    }
+    if (i < 0) {
+        i = sql.indexOf(S);
+    }
+    if (i >= 0) {
+        return sql.substr(0, l) + " count(*) over() as " + total + ", " + sql.substr(l) + " offset " + offset + " rows fetch next " + limit + " rows only";
+    }
+    else {
+        return sql + " offset " + offset + " rows fetch next " + limit + " rows only";
+    }
 }
 exports.buildPagingQueryForOracle = buildPagingQueryForOracle;
 function buildCountQuery(sql) {
-  var sql2 = sql.trim();
-  var i = sql2.indexOf('select ');
-  if (i < 0) {
-    return sql;
-  }
-  var j = sql2.indexOf(' from ', i + 6);
-  if (j < 0) {
-    return sql;
-  }
-  var k = sql2.indexOf(' order by ', j);
-  var h = sql2.indexOf(' distinct ');
-  if (h > 0) {
-    var sql3 = 'select count(*) from (' + sql2.substring(i) + ') as main';
-    return sql3;
-  }
-  if (k > 0) {
-    var sql3 = 'select count(*) ' + sql2.substring(j, k);
-    return sql3;
-  }
-  else {
-    var sql3 = 'select count(*) ' + sql2.substring(j);
-    return sql3;
-  }
+    var sql2 = sql.trim();
+    var i = sql2.indexOf('select ');
+    if (i < 0) {
+        return sql;
+    }
+    var j = sql2.indexOf(' from ', i + 6);
+    if (j < 0) {
+        return sql;
+    }
+    var k = sql2.indexOf(' order by ', j);
+    var h = sql2.indexOf(' distinct ');
+    if (h > 0) {
+        var sql3 = 'select count(*) from (' + sql2.substring(i) + ') as main';
+        return sql3;
+    }
+    if (k > 0) {
+        var sql3 = 'select count(*) ' + sql2.substring(j, k);
+        return sql3;
+    }
+    else {
+        var sql3 = 'select count(*) ' + sql2.substring(j);
+        return sql3;
+    }
 }
 exports.buildCountQuery = buildCountQuery;

package/package.json

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

package/src/batch.ts

@@ -3,7 +3,7 @@ import { Attributes, Statement } from './metadata';
 
 export class SqlInserter<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) {
+  constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: (i: number) => string, public oneIfSuccess?: boolean, public map?: (v: T) => T) {
     this.write = this.write.bind(this);
     const x = version(attributes);
     if (x) {
@@ -20,7 +20,11 @@ export class SqlInserter<T> {
     }
     const stmt = buildToInsert(obj2, this.table, this.attributes, this.param, this.version);
     if (stmt) {
-      return this.exec(stmt.query, stmt.params);
+      if (this.oneIfSuccess) {
+        return this.exec(stmt.query, stmt.params).then(ct => ct > 0 ? 1 : 0);
+      } else {
+        return this.exec(stmt.query, stmt.params);
+      }
     } else {
       return Promise.resolve(0);
     }
@@ -29,7 +33,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) {
+  constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: (i: number) => string, public oneIfSuccess?: boolean, public map?: (v: T) => T) {
     this.write = this.write.bind(this);
     const x = version(attributes);
     if (x) {
@@ -46,7 +50,11 @@ export class SqlUpdater<T> {
     }
     const stmt = buildToUpdate(obj2, this.table, this.attributes, this.param, this.version);
     if (stmt) {
-      return this.exec(stmt.query, stmt.params);
+      if (this.oneIfSuccess) {
+        return this.exec(stmt.query, stmt.params).then(ct => ct > 0 ? 1 : 0);
+      } else {
+        return this.exec(stmt.query, stmt.params);
+      }
     } else {
       return Promise.resolve(0);
     }
@@ -55,7 +63,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) {
+  constructor(public exec: (sql: string, args?: any[]) => Promise<number>, public table: string, public attributes: Attributes, public param: ((i: number) => string) | boolean, public oneIfSuccess?: boolean, public map?: (v: T) => T) {
     this.write = this.write.bind(this);
     const x = version(attributes);
     if (x) {
@@ -76,7 +84,11 @@ export class SqlBatchInserter<T> {
     }
     const stmt = buildToInsertBatch(list, this.table, this.attributes, this.param, this.version);
     if (stmt) {
-      return this.exec(stmt.query, stmt.params);
+      if (this.oneIfSuccess) {
+        return this.exec(stmt.query, stmt.params).then(ct => objs.length);
+      } else {
+        return this.exec(stmt.query, stmt.params);
+      }
     } else {
       return Promise.resolve(0);
     }
@@ -85,7 +97,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) {
+  constructor(public execBatch: (statements: Statement[]) => Promise<number>, public table: string, public attributes: Attributes, public param: (i: number) => string, public oneIfSuccess?: boolean, protected notSkipInvalid?: boolean, public map?: (v: T) => T) {
     this.write = this.write.bind(this);
     const x = version(attributes);
     if (x) {
@@ -106,7 +118,11 @@ export class SqlBatchUpdater<T> {
     }
     const stmts = buildToUpdateBatch(list, this.table, this.attributes, this.param, this.notSkipInvalid);
     if (stmts && stmts.length > 0) {
-      return this.execBatch(stmts);
+      if (this.oneIfSuccess) {
+        return this.execBatch(stmts).then(ct => stmts.length);
+      } else {
+        return this.execBatch(stmts);
+      }
     } else {
       return Promise.resolve(0);
     }

package/src/search.ts

@@ -32,7 +32,12 @@ export function buildFromQuery<T>(query: <K>(sql: string, args?: any[], m?: Stri
       });
       return Promise.all([resultPromise, countPromise]).then(r => {
         const [list, total] = r;
-        return {list, total};
+        if (typeof total === 'string' && !isNaN(total)) {
+          const t = parseInt(total, 10);
+          return {list, total: t};
+        } else {
+          return {list, total};
+        }
       });
     }
   }