query-core 0.1.8 → 0.1.12

package/lib/SearchBuilder.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var build_1 = require("./build");
 var query_1 = require("./query");
 var search_1 = require("./search");
-exports.postgre = 'postgre';
+exports.postgres = 'postgres';
 exports.mssql = 'mssql';
 exports.mysql = 'mysql';
 exports.sqlite = 'sqlite';
@@ -33,7 +33,7 @@ var SearchBuilder = (function () {
       if (provider === search_1.oracle) {
         this.buildParam = query_1.buildOracleParam;
       }
-      else if (provider === exports.postgre) {
+      else if (provider === exports.postgres) {
         this.buildParam = query_1.buildDollarParam;
       }
       else if (provider === exports.mssql) {
@@ -45,17 +45,25 @@ var SearchBuilder = (function () {
     }
     this.total = (total && total.length > 0 ? total : 'total');
   }
-  SearchBuilder.prototype.search = function (s, limit, skip, fields) {
-    var _this = this;
+  SearchBuilder.prototype.search = function (s, limit, offset, fields) {
+    var skip = 0;
+    if (typeof offset === 'number' && offset > 0) {
+      skip = offset;
+    }
     var st = (this.sort ? this.sort : 'sort');
     var sn = s[st];
     delete s[st];
-    var x = (this.provider === exports.postgre ? 'ilike' : this.buildParam);
-    var q2 = query_1.buildQuery(s, x, this.table, this.attributes, sn, fields, this.q, this.excluding, this.buildSort);
-    if (this.fromDB) {
+    var x = (this.provider === exports.postgres ? 'ilike' : this.buildParam);
+    var q2 = this.buildQuery(s, x, this.table, this.attributes, sn, fields, this.q, this.excluding, this.buildSort);
+    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, skip, this.map, this.bools, this.provider, this.total).then(function (r) {
         if (r.list && r.list.length > 0) {
-          r.list = r.list.map(function (o) { return _this.fromDB(o); });
+          r.list = r.list.map(function (o) { return fn(o); });
+          return r;
         }
         else {
           return r;

package/lib/batch.js

@@ -91,7 +91,7 @@ var SqlBatchInserter = (function () {
         list.push(obj2);
       }
     }
-    var stmt = build_1.buildToInsertBatch(list, this.table, this.attributes, this.param);
+    var stmt = build_1.buildToInsertBatch(list, this.table, this.attributes, this.param, this.version);
     if (stmt) {
       return this.exec(stmt.query, stmt.params);
     }

package/lib/build.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-function params(length, param, from) {
+function params(length, p, from) {
   if (from === undefined || from == null) {
     from = 0;
   }
   var ps = [];
   for (var i = 1; i <= length; i++) {
-    ps.push(param(i + from));
+    ps.push(p(i + from));
   }
   return ps;
 }
@@ -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: [] };
@@ -31,15 +31,17 @@ function select(obj, table, ks, buildParam, i) {
     var args = [];
     for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
       var k = ks_1[_i];
-      var field = (k.field ? k.field : k.name);
-      cols.push(field + " = " + buildParam(i++));
-      args.push(obj[k.name]);
+      if (k.name) {
+        var field = (k.column ? k.column : k.name);
+        cols.push(field + " = " + buildParam(i++));
+        args.push(obj[k.name]);
+      }
     }
     var query = "select * from " + table + " where " + cols.join(' and ');
     return { query: query, params: args };
   }
   else {
-    return null;
+    return undefined;
   }
 }
 exports.select = select;
@@ -51,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: [] };
@@ -66,15 +68,17 @@ function exist(obj, table, ks, buildParam, col, i) {
     var args = [];
     for (var _i = 0, ks_2 = ks; _i < ks_2.length; _i++) {
       var k = ks_2[_i];
-      var field = (k.field ? k.field : k.name);
-      cols.push(field + " = " + buildParam(i++));
-      args.push(obj[k.name]);
+      if (k.name) {
+        var field = (k.column ? k.column : k.name);
+        cols.push(field + " = " + buildParam(i++));
+        args.push(obj[k.name]);
+      }
     }
     var query = "select * from " + table + " where " + cols.join(' and ');
     return { query: query, params: args };
   }
   else {
-    return null;
+    return undefined;
   }
 }
 exports.exist = exist;
@@ -83,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: [] };
@@ -98,15 +102,17 @@ function buildToDelete(obj, table, ks, buildParam, i) {
     var args = [];
     for (var _i = 0, ks_3 = ks; _i < ks_3.length; _i++) {
       var k = ks_3[_i];
-      var field = (k.field ? k.field : k.name);
-      cols.push(field + " = " + buildParam(i++));
-      args.push(obj[k.name]);
+      if (k.name) {
+        var field = (k.column ? k.column : k.name);
+        cols.push(field + " = " + buildParam(i++));
+        args.push(obj[k.name]);
+      }
     }
     var query = "delete from " + table + " where " + cols.join(' and ');
     return { query: query, params: args };
   }
   else {
-    return null;
+    return undefined;
   }
 }
 exports.buildToDelete = buildToDelete;
@@ -124,6 +130,7 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
   if (!i) {
     i = 1;
   }
+  var o = obj;
   var ks = Object.keys(attrs);
   var cols = [];
   var values = [];
@@ -131,14 +138,14 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
   var isVersion = false;
   for (var _i = 0, ks_4 = ks; _i < ks_4.length; _i++) {
     var k = ks_4[_i];
-    var v = obj[k];
+    var v = o[k];
     var attr = attrs[k];
     if (attr && !attr.ignored && !attr.noinsert) {
       if (v === undefined || v == null) {
         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;
@@ -184,12 +191,12 @@ 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);
   }
   if (cols.length === 0) {
-    return null;
+    return undefined;
   }
   else {
     var query = "insert into " + table + "(" + cols.join(',') + ")values(" + values.join(',') + ")";
@@ -197,8 +204,8 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
   }
 }
 exports.buildToInsert = buildToInsert;
-function insertBatch(exec, objs, table, attrs, buildParam, i) {
-  var stm = buildToInsertBatch(objs, table, attrs, buildParam, i);
+function insertBatch(exec, objs, table, attrs, buildParam, ver, i) {
+  var stm = buildToInsertBatch(objs, table, attrs, buildParam, ver, i);
   if (!stm) {
     return Promise.resolve(0);
   }
@@ -207,78 +214,169 @@ function insertBatch(exec, objs, table, attrs, buildParam, i) {
   }
 }
 exports.insertBatch = insertBatch;
-function buildToInsertBatch(objs, table, attrs, buildParam, i) {
+function buildOracleParam(i) {
+  return ':' + i;
+}
+function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
   if (!i) {
     i = 1;
   }
   var ks = Object.keys(attrs);
-  var cols = [];
-  var rows = [];
   var args = [];
-  for (var _i = 0, ks_5 = ks; _i < ks_5.length; _i++) {
-    var k = ks_5[_i];
-    var attr = attrs[k];
-    if (attr && !attr.ignored && !attr.noinsert) {
-      var field = (attr.field ? attr.field : k);
-      cols.push(field);
-    }
-  }
-  for (var _a = 0, objs_1 = objs; _a < objs_1.length; _a++) {
-    var obj = objs_1[_a];
-    var values = [];
-    for (var _b = 0, ks_6 = ks; _b < ks_6.length; _b++) {
-      var k = ks_6[_b];
+  if (buildParam && typeof buildParam === 'function') {
+    var cols = [];
+    var rows = [];
+    for (var _i = 0, ks_5 = ks; _i < ks_5.length; _i++) {
+      var k = ks_5[_i];
       var attr = attrs[k];
       if (attr && !attr.ignored && !attr.noinsert) {
-        var v = obj[k];
-        if (v === undefined || v === null) {
-          v = attr.default;
-        }
-        if (attr.version) {
-          values.push('1');
-        }
-        else if (v === undefined || v == null) {
-          values.push('null');
-        }
-        else if (v === '') {
-          values.push("''");
-        }
-        else if (typeof v === 'number') {
-          values.push(toString(v));
-        }
-        else if (typeof v === 'boolean') {
-          if (attr.true === undefined) {
-            if (v === true) {
-              values.push("true");
+        var field = (attr.column ? attr.column : k);
+        cols.push(field);
+      }
+    }
+    for (var _a = 0, objs_1 = objs; _a < objs_1.length; _a++) {
+      var obj = objs_1[_a];
+      var values = [];
+      for (var _b = 0, ks_6 = ks; _b < ks_6.length; _b++) {
+        var k = ks_6[_b];
+        var attr = attrs[k];
+        if (attr && !attr.ignored && !attr.noinsert) {
+          var v = obj[k];
+          if (v === undefined || v === null) {
+            v = attr.default;
+          }
+          if (attr.version) {
+            values.push('1');
+          }
+          else if (v === undefined || v == null) {
+            values.push('null');
+          }
+          else if (v === '') {
+            values.push("''");
+          }
+          else if (typeof v === 'number') {
+            values.push(toString(v));
+          }
+          else if (typeof v === 'boolean') {
+            if (attr.true === undefined) {
+              if (v === true) {
+                values.push("true");
+              }
+              else {
+                values.push("false");
+              }
             }
             else {
-              values.push("false");
+              var p = buildParam(i++);
+              values.push(p);
+              if (v === true) {
+                var v2 = (attr.true ? attr.true : '1');
+                args.push(v2);
+              }
+              else {
+                var v2 = (attr.false ? attr.false : '0');
+                args.push(v2);
+              }
             }
           }
           else {
             var p = buildParam(i++);
             values.push(p);
-            if (v === true) {
-              var v2 = (attr.true ? attr.true : '1');
-              args.push(v2);
+            args.push(v);
+          }
+        }
+      }
+      rows.push("(" + values.join(',') + ")");
+    }
+    var query = "insert into " + table + "(" + cols.join(',') + ")values " + rows.join(',');
+    return { query: query, params: args };
+  }
+  else {
+    var notSkipInvalid = false;
+    if (buildParam === true) {
+      notSkipInvalid = true;
+    }
+    var rows = [];
+    for (var _c = 0, objs_2 = objs; _c < objs_2.length; _c++) {
+      var obj = objs_2[_c];
+      var cols = [];
+      var values = [];
+      var isVersion = false;
+      for (var _d = 0, ks_7 = ks; _d < ks_7.length; _d++) {
+        var k = ks_7[_d];
+        var v = obj[k];
+        var attr = attrs[k];
+        if (attr && !attr.ignored && !attr.noinsert) {
+          if (v === undefined || v == null) {
+            v = attr.default;
+          }
+          if (v !== undefined && v != null) {
+            var field = (attr.column ? attr.column : k);
+            cols.push(field);
+            if (k === ver) {
+              isVersion = true;
+              values.push("" + 1);
             }
             else {
-              var v2 = (attr.false ? attr.false : '0');
-              args.push(v2);
+              if (v === '') {
+                values.push("''");
+              }
+              else if (typeof v === 'number') {
+                values.push(toString(v));
+              }
+              else if (typeof v === 'boolean') {
+                if (attr.true === undefined) {
+                  if (v === true) {
+                    values.push("true");
+                  }
+                  else {
+                    values.push("false");
+                  }
+                }
+                else {
+                  var p = buildOracleParam(i++);
+                  values.push(p);
+                  if (v === true) {
+                    var v2 = (attr.true ? attr.true : '1');
+                    args.push(v2);
+                  }
+                  else {
+                    var v2 = (attr.false ? attr.false : '0');
+                    args.push(v2);
+                  }
+                }
+              }
+              else {
+                var p = buildOracleParam(i++);
+                values.push(p);
+                args.push(v);
+              }
             }
           }
         }
-        else {
-          var p = buildParam(i++);
-          values.push(p);
-          args.push(v);
+      }
+      if (!isVersion && ver && ver.length > 0) {
+        var attr = attrs[ver];
+        var field = (attr.column ? attr.column : ver);
+        cols.push(field);
+        values.push("" + 1);
+      }
+      if (cols.length === 0) {
+        if (notSkipInvalid) {
+          return undefined;
         }
       }
+      else {
+        var s = "into " + table + "(" + cols.join(',') + ")values(" + values.join(',') + ")";
+        rows.push(s);
+      }
+    }
+    if (rows.length === 0) {
+      return undefined;
     }
-    rows.push("(" + values.join(',') + ")");
+    var query = "insert all " + rows.join(' ') + " select * from dual";
+    return { query: query, params: args };
   }
-  var query = "insert into " + table + "(" + cols.join(',') + ")values " + rows.join(',');
-  return { query: query, params: args };
 }
 exports.buildToInsertBatch = buildToInsertBatch;
 function update(exec, obj, table, attrs, buildParam, ver, i) {
@@ -295,14 +393,15 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
   if (!i) {
     i = 1;
   }
+  var o = obj;
   var ks = Object.keys(attrs);
   var pks = [];
   var colSet = [];
   var colQuery = [];
   var args = [];
-  for (var _i = 0, ks_7 = ks; _i < ks_7.length; _i++) {
-    var k = ks_7[_i];
-    var v = obj[k];
+  for (var _i = 0, ks_8 = ks; _i < ks_8.length; _i++) {
+    var k = ks_8[_i];
+    var v = o[k];
     if (v !== undefined) {
       var attr = attrs[k];
       attr.name = k;
@@ -311,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';
@@ -354,13 +453,14 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
   }
   for (var _a = 0, pks_1 = pks; _a < pks_1.length; _a++) {
     var pk = pks_1[_a];
-    var v = obj[pk.name];
+    var na = (pk.name ? pk.name : '');
+    var v = o[na];
     if (!v) {
-      return null;
+      return undefined;
     }
     else {
-      var attr = attrs[pk.name];
-      var field = (attr.field ? attr.field : pk.name);
+      var attr = attrs[na];
+      var field = (attr.column ? attr.column : pk.name);
       var x = void 0;
       if (v == null) {
         x = 'null';
@@ -391,18 +491,18 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
     }
   }
   if (ver && ver.length > 0) {
-    var v = obj[ver];
+    var v = o[ver];
     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);
       }
     }
   }
   if (colSet.length === 0 || colQuery.length === 0) {
-    return null;
+    return undefined;
   }
   else {
     var query = "update " + table + " set " + colSet.join(',') + " where " + colQuery.join(' and ');
@@ -424,22 +524,24 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
   var sts = [];
   var meta = metadata(attrs);
   if (!meta.keys || meta.keys.length === 0) {
-    return null;
+    return undefined;
   }
-  for (var _i = 0, objs_2 = objs; _i < objs_2.length; _i++) {
-    var obj = objs_2[_i];
+  for (var _i = 0, objs_3 = objs; _i < objs_3.length; _i++) {
+    var obj = objs_3[_i];
+    var o = obj;
     var i = 1;
-    var ks = Object.keys(obj);
+    var ks = Object.keys(o);
     var colSet = [];
     var colQuery = [];
     var args = [];
-    for (var _a = 0, ks_8 = ks; _a < ks_8.length; _a++) {
-      var k = ks_8[_a];
-      var v = obj[k];
+    for (var _a = 0, ks_9 = ks; _a < ks_9.length; _a++) {
+      var k = ks_9[_a];
+      var v = o[k];
       if (v !== undefined) {
         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';
@@ -482,13 +584,14 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
     var valid = true;
     for (var _b = 0, _c = meta.keys; _b < _c.length; _b++) {
       var pk = _c[_b];
-      var v = obj[pk.name];
+      var na = (pk.name ? pk.name : '');
+      var v = o[na];
       if (!v) {
         valid = false;
       }
       else {
-        var attr = attrs[pk.name];
-        var field = (attr.field ? attr.field : pk.name);
+        var attr = attrs[na];
+        var field = (attr.column ? attr.column : pk.name);
         var x = void 0;
         if (v == null) {
           x = 'null';
@@ -520,17 +623,17 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
     }
     if (!valid || colSet.length === 0 || colQuery.length === 0) {
       if (notSkipInvalid) {
-        return null;
+        return undefined;
       }
     }
     else {
       var ver = meta.version;
       if (ver && ver.length > 0) {
-        var v = obj[ver];
+        var v = o[ver];
         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);
           }
@@ -546,8 +649,8 @@ function buildToUpdateBatch(objs, table, attrs, buildParam, notSkipInvalid) {
 exports.buildToUpdateBatch = buildToUpdateBatch;
 function version(attrs) {
   var ks = Object.keys(attrs);
-  for (var _i = 0, ks_9 = ks; _i < ks_9.length; _i++) {
-    var k = ks_9[_i];
+  for (var _i = 0, ks_10 = ks; _i < ks_10.length; _i++) {
+    var k = ks_10[_i];
     var attr = attrs[k];
     if (attr.version) {
       attr.name = k;
@@ -559,22 +662,22 @@ function version(attrs) {
 exports.version = version;
 function key(attrs) {
   var ks = Object.keys(attrs);
-  for (var _i = 0, ks_10 = ks; _i < ks_10.length; _i++) {
-    var k = ks_10[_i];
+  for (var _i = 0, ks_11 = ks; _i < ks_11.length; _i++) {
+    var k = ks_11[_i];
     var attr = attrs[k];
     attr.name = k;
     if (attr.key) {
       return attr;
     }
   }
-  return null;
+  return undefined;
 }
 exports.key = key;
 function keys(attrs) {
   var ks = Object.keys(attrs);
   var ats = [];
-  for (var _i = 0, ks_11 = ks; _i < ks_11.length; _i++) {
-    var k = ks_11[_i];
+  for (var _i = 0, ks_12 = ks; _i < ks_12.length; _i++) {
+    var k = ks_12[_i];
     var attr = attrs[k];
     attr.name = k;
     if (attr.key) {
@@ -587,11 +690,11 @@ exports.keys = keys;
 function buildMap(attrs) {
   var mp = {};
   var ks = Object.keys(attrs);
-  for (var _i = 0, ks_12 = ks; _i < ks_12.length; _i++) {
-    var k = ks_12[_i];
+  for (var _i = 0, ks_13 = ks; _i < ks_13.length; _i++) {
+    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;
@@ -606,10 +709,10 @@ function metadata(attrs) {
   var ats = [];
   var bools = [];
   var fields = [];
-  var ver;
   var isMap = false;
-  for (var _i = 0, ks_13 = ks; _i < ks_13.length; _i++) {
-    var k = ks_13[_i];
+  var m = { keys: ats, fields: fields };
+  for (var _i = 0, ks_14 = ks; _i < ks_14.length; _i++) {
+    var k = ks_14[_i];
     var attr = attrs[k];
     attr.name = k;
     if (attr.key) {
@@ -622,16 +725,15 @@ function metadata(attrs) {
       bools.push(attr);
     }
     if (attr.version) {
-      ver = k;
+      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;
       isMap = true;
     }
   }
-  var m = { keys: ats, fields: fields, version: ver };
   if (isMap) {
     m.map = mp;
   }
@@ -645,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;