query-core 0.1.29 → 0.1.30

package/lib/build.js

@@ -1,5 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+var resource = (function () {
+  function resource() {
+  }
+  return resource;
+}());
+exports.resource = resource;
 function params(length, p, from) {
   if (from === undefined || from == null) {
     from = 0;
@@ -181,9 +187,14 @@ function buildToInsert(obj, table, attrs, buildParam, ver, i) {
             }
           }
           else {
-            var p = buildParam(i++);
-            values.push(p);
-            args.push(v);
+            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+              values.push("'" + v + "'");
+            }
+            else {
+              var p = buildParam(i++);
+              values.push(p);
+              args.push(v);
+            }
           }
         }
       }
@@ -280,9 +291,14 @@ function buildToInsertBatch(objs, table, attrs, buildParam, ver, i) {
             }
           }
           else {
-            var p = buildParam(i++);
-            values.push(p);
-            args.push(v);
+            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+              values.push("'" + v + "'");
+            }
+            else {
+              var p = buildParam(i++);
+              values.push(p);
+              args.push(v);
+            }
           }
         }
       }
@@ -443,8 +459,13 @@ function buildToUpdate(obj, table, attrs, buildParam, ver, i) {
             }
           }
           else {
-            x = buildParam(i++);
-            args.push(v);
+            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+              x = "'" + v + "'";
+            }
+            else {
+              x = buildParam(i++);
+              args.push(v);
+            }
           }
           colSet.push(field + "=" + x);
         }

package/lib/index.js

@@ -1,10 +1,11 @@
 "use strict";
 function __export(m) {
-  for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 var health_1 = require("./health");
 exports.SqlChecker = health_1.Checker;
+var build_1 = require("./build");
 var services_1 = require("./services");
 exports.SqlViewRepository = services_1.SqlLoader;
 exports.SqlLoadService = services_1.SqlLoader;
@@ -33,77 +34,71 @@ __export(require("./query"));
 __export(require("./search"));
 __export(require("./SearchBuilder"));
 __export(require("./client"));
-var resource = (function () {
-  function resource() {
-  }
-  return resource;
-}());
-exports.resource = resource;
 var Loader = (function () {
-  function Loader(query, sql, m, bools) {
-    this.query = query;
-    this.sql = sql;
-    this.bools = bools;
-    this.map = m;
-    this.load = this.load.bind(this);
-  }
-  Loader.prototype.load = function () {
-    return this.query(this.sql, [], this.map, this.bools);
-  };
-  return Loader;
+    function Loader(query, sql, m, bools) {
+        this.query = query;
+        this.sql = sql;
+        this.bools = bools;
+        this.map = m;
+        this.load = this.load.bind(this);
+    }
+    Loader.prototype.load = function () {
+        return this.query(this.sql, [], this.map, this.bools);
+    };
+    return Loader;
 }());
 exports.Loader = Loader;
 function toArray(arr) {
-  if (!arr || arr.length === 0) {
-    return [];
-  }
-  var p = [];
-  var l = arr.length;
-  for (var i = 0; i < l; i++) {
-    if (arr[i] === undefined || arr[i] == null) {
-      p.push(null);
+    if (!arr || arr.length === 0) {
+        return [];
     }
-    else {
-      if (typeof arr[i] === 'object') {
-        if (arr[i] instanceof Date) {
-          p.push(arr[i]);
+    var p = [];
+    var l = arr.length;
+    for (var i = 0; i < l; i++) {
+        if (arr[i] === undefined || arr[i] == null) {
+            p.push(null);
         }
         else {
-          if (resource.string) {
-            var s = JSON.stringify(arr[i]);
-            p.push(s);
-          }
-          else {
-            p.push(arr[i]);
-          }
+            if (typeof arr[i] === 'object') {
+                if (arr[i] instanceof Date) {
+                    p.push(arr[i]);
+                }
+                else {
+                    if (build_1.resource.string) {
+                        var s = JSON.stringify(arr[i]);
+                        p.push(s);
+                    }
+                    else {
+                        p.push(arr[i]);
+                    }
+                }
+            }
+            else {
+                p.push(arr[i]);
+            }
         }
-      }
-      else {
-        p.push(arr[i]);
-      }
     }
-  }
-  return p;
+    return p;
 }
 exports.toArray = toArray;
 function map(obj, m) {
-  if (!m) {
-    return obj;
-  }
-  var mkeys = Object.keys(m);
-  if (mkeys.length === 0) {
-    return obj;
-  }
-  var obj2 = {};
-  var keys = Object.keys(obj);
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i];
-    var k0 = m[key];
-    if (!k0) {
-      k0 = key;
+    if (!m) {
+        return obj;
+    }
+    var mkeys = Object.keys(m);
+    if (mkeys.length === 0) {
+        return obj;
+    }
+    var obj2 = {};
+    var keys = Object.keys(obj);
+    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+        var key = keys_1[_i];
+        var k0 = m[key];
+        if (!k0) {
+            k0 = key;
+        }
+        obj2[k0] = obj[key];
     }
-    obj2[k0] = obj[key];
-  }
-  return obj2;
+    return obj2;
 }
 exports.map = map;

package/lib/search.js

@@ -1,63 +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 };
-        });
+  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);
     }
     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);
+      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 {
-            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 { 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';
@@ -66,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.29",
+  "version": "0.1.30",
   "description": "query",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/build.ts

@@ -1,5 +1,10 @@
 import {Attribute, Attributes, Statement, StringMap} from './metadata';
 
+// tslint:disable-next-line:class-name
+export class resource {
+  static string?: boolean;
+  static ignoreDatetime?: boolean;
+}
 export function params(length: number, p: (i: number) => string, from?: number): string[] {
   if (from === undefined || from == null) {
     from = 0;
@@ -155,9 +160,13 @@ export function buildToInsert<T>(obj: T, table: string, attrs: Attributes, build
               }
             }
           } else {
-            const p = buildParam(i++);
-            values.push(p);
-            args.push(v);
+            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+              values.push(`'${v}'`);
+            } else {
+              const p = buildParam(i++);
+              values.push(p);
+              args.push(v);
+            }
           }
         }
       }
@@ -240,9 +249,13 @@ export function buildToInsertBatch<T>(objs: T[], table: string, attrs: Attribute
               }
             }
           } else {
-            const p = buildParam(i++);
-            values.push(p);
-            args.push(v);
+            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+              values.push(`'${v}'`);
+            } else {
+              const p = buildParam(i++);
+              values.push(p);
+              args.push(v);
+            }
           }
         }
       }
@@ -380,8 +393,12 @@ export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, build
               }
             }
           } else {
-            x = buildParam(i++);
-            args.push(v);
+            if (resource.ignoreDatetime && typeof v === 'string' && attr.type === 'datetime') {
+              x = `'${v}'`;
+            } else {
+              x = buildParam(i++);
+              args.push(v);
+            }
           }
           colSet.push(`${field}=${x}`);
         }

package/src/index.ts

@@ -1,6 +1,7 @@
 import {Checker} from './health';
 export {Checker as SqlChecker};
 
+import {resource} from './build';
 import {Attribute, StringMap} from './metadata';
 import {SqlLoader, SqlSearchLoader, SqlSearchWriter, SqlWriter} from './services';
 // export {SqlLoader as SqlLoadRepository};
@@ -50,10 +51,7 @@ export interface Config {
   min?: number | undefined;
   idleTimeoutMillis?: number | undefined;
 }
-// tslint:disable-next-line:class-name
-export class resource {
-  static string?: boolean;
-}
+
 // tslint:disable-next-line:max-classes-per-file
 export class Loader<T> {
   map?: StringMap;