query-core 0.1.5 → 0.1.9

package/src/SearchBuilder.ts

@@ -3,28 +3,28 @@ import {Attribute, Attributes, Statement, StringMap} from './metadata';
 import {buildDollarParam, buildMsSQLParam, buildOracleParam, buildQuery, buildSort as bs, LikeType} from './query';
 import {buildFromQuery, oracle, SearchResult} from './search';
 
-export const postgre = 'postgre';
+export const postgres = 'postgres';
 export const mssql = 'mssql';
 export const mysql = 'mysql';
 export const sqlite = 'sqlite';
 export class SearchBuilder<T, S> {
   map?: StringMap;
   bools?: Attribute[];
-  buildQuery: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort: string, map?: Attributes|StringMap) => string) => Statement;
+  buildQuery: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort?: string, map?: Attributes|StringMap) => string) => Statement|undefined;
   q?: string;
   excluding?: string;
-  buildSort?: (sort: string, map?: Attributes|StringMap) => string;
-  buildParam?: (i: number) => string;
+  buildSort?: (sort?: string, map?: Attributes|StringMap) => string;
+  buildParam: (i: number) => string;
   total?: string;
   constructor(public query: (sql: string, args?: any[], m?: StringMap, bools?: Attribute[]) => Promise<T[]>, public table: string,
     public attributes?: Attributes,
     public provider?: string,
-    buildQ?: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort: string, map?: Attributes|StringMap) => string) => Statement,
+    buildQ?: (s: S, bparam: LikeType|((i: number ) => string), table?: string, attrs?: Attributes, sort?: string, fields?: string[], sq?: string, strExcluding?: string, buildSort3?: (sort?: string, map?: Attributes|StringMap) => string) => Statement|undefined,
     public fromDB?: (v: T) => T,
     public sort?: string,
     q?: string,
     excluding?: string,
-    buildSort?: (sort: string, map?: Attributes|StringMap) => string,
+    buildSort?: (sort?: string, map?: Attributes|StringMap) => string,
     buildParam?: (i: number) => string,
     total?: string) {
       if (attributes) {
@@ -43,7 +43,7 @@ export class SearchBuilder<T, S> {
       } else {
         if (provider === oracle) {
           this.buildParam = buildOracleParam;
-        } else if (provider === postgre) {
+        } else if (provider === postgres) {
           this.buildParam = buildDollarParam;
         } else if (provider === mssql) {
           this.buildParam = buildMsSQLParam;
@@ -53,16 +53,25 @@ export class SearchBuilder<T, S> {
       }
       this.total = (total && total.length > 0 ? total : 'total');
     }
-  search(s: S, limit?: number, skip?: number, fields?: string[]): Promise<SearchResult<T>> {
+  search(s: S, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>> {
+    let skip = 0;
+    if (typeof offset === 'number' && offset > 0) {
+      skip = offset;
+    }
     const st = (this.sort ? this.sort : 'sort');
-    const sn = s[st] as string;
-    delete s[st];
-    const x = (this.provider === postgre ? 'ilike' : this.buildParam);
-    const q2 = buildQuery(s, x, this.table, this.attributes, sn, fields, this.q, this.excluding, this.buildSort);
-    if (this.fromDB) {
+    const sn = (s as any)[st] as string;
+    delete (s as any)[st];
+    const x = (this.provider === postgres ? 'ilike' : this.buildParam);
+    const 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');
+    }
+    const fn = this.fromDB;
+    if (fn) {
       return buildFromQuery(this.query, q2.query, q2.params, limit, skip, this.map, this.bools, this.provider, this.total).then(r => {
         if (r.list && r.list.length > 0) {
-          r.list = r.list.map(o => this.fromDB(o));
+          r.list = r.list.map(o => fn(o));
+          return r;
         } else {
           return r;
         }

package/src/batch.ts

@@ -53,7 +53,7 @@ export class SqlUpdater<T> {
 }
 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, 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 map?: (v: T) => T) {
     this.write = this.write.bind(this);
     const x = version(attributes);
     if (x) {
@@ -72,7 +72,7 @@ export class SqlBatchInserter<T> {
         list.push(obj2);
       }
     }
-    const stmt = buildToInsertBatch(list, this.table, this.attributes, this.param);
+    const stmt = buildToInsertBatch(list, this.table, this.attributes, this.param, this.version);
     if (stmt) {
       return this.exec(stmt.query, stmt.params);
     } else {

package/src/build.ts

@@ -1,6 +1,16 @@
 import {Attribute, Attributes, Statement, StringMap} from './metadata';
 
-export function select<T>(obj: T, table: string, ks: Attribute[], buildParam: (i: number) => string, i?: number): Statement {
+export function params(length: number, p: (i: number) => string, from?: number): string[] {
+  if (from === undefined || from == null) {
+    from = 0;
+  }
+  const ps: string[] = [];
+  for (let i = 1; i <= length; i++) {
+    ps.push(p(i + from));
+  }
+  return ps;
+}
+export function select<T>(obj: T, table: string, ks: Attribute[], buildParam: (i: number) => string, i?: number): Statement|undefined {
   if (!i) {
     i = 1;
   }
@@ -17,17 +27,19 @@ export function select<T>(obj: T, table: string, ks: Attribute[], buildParam: (i
     const cols: string[] = [];
     const args: any[] = [];
     for (const k of ks) {
-      const field = (k.field ? k.field : k.name);
-      cols.push(`${field} = ${buildParam(i++)}`);
-      args.push(obj[k.name]);
+      if (k.name) {
+        const field = (k.field ? k.field : k.name);
+        cols.push(`${field} = ${buildParam(i++)}`);
+        args.push((obj as any)[k.name]);
+      }
     }
     const query = `select * from ${table} where ${cols.join(' and ')}`;
     return { query, params: args };
   } else {
-    return null;
+    return undefined;
   }
 }
-export function exist<T>(obj: T, table: string, ks: Attribute[], buildParam: (i: number) => string, col?: string, i?: number): Statement {
+export function exist<T>(obj: T, table: string, ks: Attribute[], buildParam: (i: number) => string, col?: string, i?: number): Statement|undefined {
   if (!i) {
     i = 1;
   }
@@ -47,17 +59,19 @@ export function exist<T>(obj: T, table: string, ks: Attribute[], buildParam: (i:
     const cols: string[] = [];
     const args: any[] = [];
     for (const k of ks) {
-      const field = (k.field ? k.field : k.name);
-      cols.push(`${field} = ${buildParam(i++)}`);
-      args.push(obj[k.name]);
+      if (k.name) {
+        const field = (k.field ? k.field : k.name);
+        cols.push(`${field} = ${buildParam(i++)}`);
+        args.push((obj as any)[k.name]);
+      }
     }
     const query = `select * from ${table} where ${cols.join(' and ')}`;
     return { query, params: args };
   } else {
-    return null;
+    return undefined;
   }
 }
-export function buildToDelete<T>(obj: T, table: string, ks: Attribute[], buildParam: (i: number) => string, i?: number): Statement {
+export function buildToDelete<T>(obj: T, table: string, ks: Attribute[], buildParam: (i: number) => string, i?: number): Statement|undefined {
   if (!i) {
     i = 1;
   }
@@ -74,14 +88,16 @@ export function buildToDelete<T>(obj: T, table: string, ks: Attribute[], buildPa
     const cols: string[] = [];
     const args: any[] = [];
     for (const k of ks) {
-      const field = (k.field ? k.field : k.name);
-      cols.push(`${field} = ${buildParam(i++)}`);
-      args.push(obj[k.name]);
+      if (k.name) {
+        const field = (k.field ? k.field : k.name);
+        cols.push(`${field} = ${buildParam(i++)}`);
+        args.push((obj as any)[k.name]);
+      }
     }
     const query = `delete from ${table} where ${cols.join(' and ')}`;
     return { query, params: args };
   } else {
-    return null;
+    return undefined;
   }
 }
 export function insert<T>(exec: (sql: string, args?: any[]) => Promise<number>, obj: T, table: string, attrs: Attributes, buildParam: (i: number) => string, ver?: string, i?: number): Promise<number> {
@@ -92,17 +108,18 @@ export function insert<T>(exec: (sql: string, args?: any[]) => Promise<number>,
     return exec(stm.query, stm.params);
   }
 }
-export function buildToInsert<T>(obj: T, table: string, attrs: Attributes, buildParam: (i: number) => string, ver?: string, i?: number): Statement {
+export function buildToInsert<T>(obj: T, table: string, attrs: Attributes, buildParam: (i: number) => string, ver?: string, i?: number): Statement|undefined {
   if (!i) {
     i = 1;
   }
+  const o: any = obj;
   const ks = Object.keys(attrs);
   const cols: string[] = [];
   const values: string[] = [];
   const args: any[] = [];
   let isVersion = false;
   for (const k of ks) {
-    let v = obj[k];
+    let v = o[k];
     const attr = attrs[k];
     if (attr && !attr.ignored && !attr.noinsert) {
       if (v === undefined || v == null) {
@@ -153,82 +170,162 @@ export function buildToInsert<T>(obj: T, table: string, attrs: Attributes, build
     values.push(`${1}`);
   }
   if (cols.length === 0) {
-    return null;
+    return undefined;
   } else {
     const query = `insert into ${table}(${cols.join(',')})values(${values.join(',')})`;
     return { query, params: args };
   }
 }
-export function insertBatch<T>(exec: (sql: string, args?: any[]) => Promise<number>, objs: T[], table: string, attrs: Attributes, buildParam: (i: number) => string, i?: number): Promise<number> {
-  const stm = buildToInsertBatch(objs, table, attrs, buildParam, i);
+export function insertBatch<T>(exec: (sql: string, args?: any[]) => Promise<number>, objs: T[], table: string, attrs: Attributes, buildParam: ((i: number) => string)|boolean, ver?: string, i?: number): Promise<number> {
+  const stm = buildToInsertBatch(objs, table, attrs, buildParam, ver, i);
   if (!stm) {
     return Promise.resolve(0);
   } else {
     return exec(stm.query, stm.params);
   }
 }
-export function buildToInsertBatch<T>(objs: T[], table: string, attrs: Attributes, buildParam: (i: number) => string, i?: number): Statement {
+function buildOracleParam(i: number): string {
+  return ':' + i;
+}
+export function buildToInsertBatch<T>(objs: T[], table: string, attrs: Attributes, buildParam: ((i: number) => string) | boolean, ver?: string, i?: number): Statement|undefined {
   if (!i) {
     i = 1;
   }
   const ks = Object.keys(attrs);
-  const cols: string[] = [];
-  const rows: string[] = [];
   const args: any[] = [];
-  for (const k of ks) {
-    const attr = attrs[k];
-    if (attr && !attr.ignored && !attr.noinsert) {
-      const field = (attr.field ? attr.field : k);
-      cols.push(field);
-    }
-  }
-  for (const obj of objs) {
-    const values: string[] = [];
+  if (buildParam && typeof buildParam === 'function') {
+    const cols: string[] = [];
+    const rows: string[] = [];
     for (const k of ks) {
       const attr = attrs[k];
       if (attr && !attr.ignored && !attr.noinsert) {
-        let v = obj[k];
-        if (v === undefined || v === null) {
-          v = attr.default;
-        }
-        // let x: string;
-        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`);
+        const field = (attr.field ? attr.field : k);
+        cols.push(field);
+      }
+    }
+    for (const obj of objs) {
+      const values: string[] = [];
+      for (const k of ks) {
+        const attr = attrs[k];
+        if (attr && !attr.ignored && !attr.noinsert) {
+          let v = (obj as any)[k];
+          if (v === undefined || v === null) {
+            v = attr.default;
+          }
+          // let x: string;
+          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`);
+              const p = buildParam(i++);
+              values.push(p);
+              if (v === true) {
+                const v2 = (attr.true ? attr.true : '1');
+                args.push(v2);
+              } else {
+                const v2 = (attr.false ? attr.false : '0');
+                args.push(v2);
+              }
             }
           } else {
             const p = buildParam(i++);
             values.push(p);
-            if (v === true) {
-              const v2 = (attr.true ? attr.true : '1');
-              args.push(v2);
+            args.push(v);
+          }
+        }
+      }
+      rows.push(`(${values.join(',')})`);
+    }
+    const query = `insert into ${table}(${cols.join(',')})values ${rows.join(',')}`;
+    return { query, params: args };
+  } else {
+    let notSkipInvalid = false;
+    if (buildParam === true) {
+      notSkipInvalid = true;
+    }
+    const rows: string[] = [];
+    for (const obj of objs) {
+      const cols: string[] = [];
+      const values: string[] = [];
+      let isVersion = false;
+      for (const k of ks) {
+        let v = (obj as any)[k];
+        const attr = attrs[k];
+        if (attr && !attr.ignored && !attr.noinsert) {
+          if (v === undefined || v == null) {
+            v = attr.default;
+          }
+          if (v !== undefined && v != null) {
+            const field = (attr.field ? attr.field : k);
+            cols.push(field);
+            if (k === ver) {
+              isVersion = true;
+              values.push(`${1}`);
             } else {
-              const 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 {
+                  const p = buildOracleParam(i++);
+                  values.push(p);
+                  if (v === true) {
+                    const v2 = (attr.true ? attr.true : '1');
+                    args.push(v2);
+                  } else {
+                    const v2 = (attr.false ? attr.false : '0');
+                    args.push(v2);
+                  }
+                }
+              } else {
+                const p = buildOracleParam(i++);
+                values.push(p);
+                args.push(v);
+              }
             }
           }
-        } else {
-          const p = buildParam(i++);
-          values.push(p);
-          args.push(v);
         }
       }
+      if (!isVersion && ver && ver.length > 0) {
+        const attr = attrs[ver];
+        const field = (attr.field ? attr.field : ver);
+        cols.push(field);
+        values.push(`${1}`);
+      }
+      if (cols.length === 0) {
+        if (notSkipInvalid) {
+          return undefined;
+        }
+      } else {
+        const s = `into ${table}(${cols.join(',')})values(${values.join(',')})`;
+        rows.push(s);
+      }
+    }
+    if (rows.length === 0) {
+      return undefined;
     }
-    rows.push(`(${values.join(',')})`);
+    const query = `insert all ${rows.join(' ')} select * from dual`;
+    return { query, params: args };
   }
-  const query = `insert into ${table}(${cols.join(',')})values ${rows.join(',')}`;
-  return { query, params: args };
 }
 export function update<T>(exec: (sql: string, args?: any[]) => Promise<number>, obj: T, table: string, attrs: Attributes, buildParam: (i: number) => string, ver?: string, i?: number): Promise<number> {
   const stm = buildToUpdate(obj, table, attrs, buildParam, ver, i);
@@ -238,17 +335,18 @@ export function update<T>(exec: (sql: string, args?: any[]) => Promise<number>,
     return exec(stm.query, stm.params);
   }
 }
-export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, buildParam: (i: number) => string, ver?: string, i?: number): Statement {
+export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, buildParam: (i: number) => string, ver?: string, i?: number): Statement|undefined {
   if (!i) {
     i = 1;
   }
+  const o: any = obj;
   const ks = Object.keys(attrs);
   const pks: Attribute[] = [];
   const colSet: string[] = [];
   const colQuery: string[] = [];
   const args: any[] = [];
   for (const k of ks) {
-    const v = obj[k];
+    const v = o[k];
     if (v !== undefined) {
       const attr = attrs[k];
       attr.name = k;
@@ -291,11 +389,12 @@ export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, build
     }
   }
   for (const pk of pks) {
-    const v = obj[pk.name];
+    const na = (pk.name ? pk.name : '');
+    const v = o[na];
     if (!v) {
-      return null;
+      return undefined;
     } else {
-      const attr = attrs[pk.name];
+      const attr = attrs[na];
       const field = (attr.field ? attr.field : pk.name);
       let x: string;
       if (v == null) {
@@ -322,7 +421,7 @@ export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, build
     }
   }
   if (ver && ver.length > 0) {
-    const v = obj[ver];
+    const v = o[ver];
     if (typeof v === 'number' && !isNaN(v)) {
       const attr = attrs[ver];
       if (attr) {
@@ -333,7 +432,7 @@ export function buildToUpdate<T>(obj: T, table: string, attrs: Attributes, build
     }
   }
   if (colSet.length === 0 || colQuery.length === 0) {
-    return null;
+    return undefined;
   } else {
     const query = `update ${table} set ${colSet.join(',')} where ${colQuery.join(' and ')}`;
     return { query, params: args };
@@ -347,22 +446,24 @@ export function updateBatch<T>(exec: (statements: Statement[]) => Promise<number
     return exec(stmts);
   }
 }
-export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attributes, buildParam: (i: number) => string, notSkipInvalid?: boolean): Statement[] {
+export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attributes, buildParam: (i: number) => string, notSkipInvalid?: boolean): Statement[]|undefined {
   const sts: Statement[] = [];
   const meta = metadata(attrs);
   if (!meta.keys || meta.keys.length === 0) {
-    return null;
+    return undefined;
   }
   for (const obj of objs) {
+    const o: any = obj;
     let i = 1;
-    const ks = Object.keys(obj);
+    const ks = Object.keys(o);
     const colSet: string[] = [];
     const colQuery: string[] = [];
     const args: any[] = [];
     for (const k of ks) {
-      const v = obj[k];
+      const v = o[k];
       if (v !== undefined) {
         const attr = attrs[k];
+        attr.name = k;
         if (attr && !attr.ignored && !attr.key && !attr.version && !attr.noupdate) {
           const field = (attr.field ? attr.field : k);
           let x: string;
@@ -399,11 +500,12 @@ export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attribute
     }
     let valid = true;
     for (const pk of meta.keys) {
-      const v = obj[pk.name];
+      const na = (pk.name ? pk.name : '');
+      const v = o[na];
       if (!v) {
         valid = false;
       } else {
-        const attr = attrs[pk.name];
+        const attr = attrs[na];
         const field = (attr.field ? attr.field : pk.name);
         let x: string;
         if (v == null) {
@@ -431,12 +533,12 @@ export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attribute
     }
     if (!valid || colSet.length === 0 || colQuery.length === 0) {
       if (notSkipInvalid) {
-        return null;
+        return undefined;
       }
     } else {
       const ver = meta.version;
       if (ver && ver.length > 0) {
-        const v = obj[ver];
+        const v = o[ver];
         if (typeof v === 'number' && !isNaN(v)) {
           const attr = attrs[ver];
           if (attr) {
@@ -453,7 +555,7 @@ export function buildToUpdateBatch<T>(objs: T[], table: string, attrs: Attribute
   }
   return sts;
 }
-export function version(attrs: Attributes): Attribute {
+export function version(attrs: Attributes): Attribute|undefined {
   const ks = Object.keys(attrs);
   for (const k of ks) {
     const attr = attrs[k];
@@ -464,7 +566,7 @@ export function version(attrs: Attributes): Attribute {
   }
   return undefined;
 }
-export function key(attrs: Attributes): Attribute {
+export function key(attrs: Attributes): Attribute|undefined {
   const ks = Object.keys(attrs);
   for (const k of ks) {
     const attr = attrs[k];
@@ -473,7 +575,7 @@ export function key(attrs: Attributes): Attribute {
       return attr;
     }
   }
-  return null;
+  return undefined;
 }
 export function keys(attrs: Attributes): Attribute[] {
   const ks = Object.keys(attrs);
@@ -514,8 +616,8 @@ export function metadata(attrs: Attributes): Metadata {
   const ats: Attribute[] = [];
   const bools: Attribute[] = [];
   const fields: string[] = [];
-  let ver: string;
   let isMap = false;
+  const m: Metadata = {keys: ats, fields};
   for (const k of ks) {
     const attr = attrs[k];
     attr.name = k;
@@ -529,7 +631,7 @@ export function metadata(attrs: Attributes): Metadata {
       bools.push(attr);
     }
     if (attr.version) {
-      ver = k;
+      m.version = k;
     }
     const field = (attr.field ? attr.field : k);
     const s = field.toLowerCase();
@@ -538,7 +640,6 @@ export function metadata(attrs: Attributes): Metadata {
       isMap = true;
     }
   }
-  const m: Metadata = {keys: ats, fields, version: ver};
   if (isMap) {
     m.map = mp;
   }
@@ -560,7 +661,7 @@ export function param(i: number): string {
 }
 export function setValue<T, V>(obj: T, path: string, value: V): void {
   const paths = path.split('.');
-  let o = obj;
+  let o: any = obj;
   for (let i = 0; i < paths.length - 1; i++) {
     const p = paths[i];
     if (p in o) {