taon-type-sql 21.0.12 → 21.0.16

package/lib-prod/builder/query-table.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const basic_column_1 = require("./column/basic-column");
+const joined_tables_chain_1 = require("./join/joined-tables-chain");
+class QueryTable {
+    _$name;
+    constructor(_$name) {
+        this._$name = _$name;
+    }
+    _$type;
+    _$idType;
+    // abstract readonly $id; // FIXME I got a dozen incomprehensible type errors
+    $all = new basic_column_1.default(this, '*');
+    innerJoin(table) {
+        return new joined_tables_chain_1.default(table, 'inner', this);
+    }
+    leftJoin(table) {
+        return new joined_tables_chain_1.default(table, 'left', this);
+    }
+    rightJoin(table) {
+        return new joined_tables_chain_1.default(table, 'right', this);
+    }
+    fullJoin(table) {
+        return new joined_tables_chain_1.default(table, 'full', this);
+    }
+}
+exports.default = QueryTable;
+//# sourceMappingURL=query-table.js.map

package/lib-prod/builder/query-table.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-table.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAAA,wDAAgD;AAEhD,oEAA2D;AAG3D,MAAe,UAAU;IAEC;IAAtB,YAAsB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAE9B,MAAM,CAAyB;IAC/B,QAAQ,CAAqB;IAEvC,6EAA6E;IAE7E,IAAI,GAAG,IAAI,sBAAW,CAAe,IAAI,EAAE,GAAG,CAAC,CAAC;IAEhD,SAAS,CAAyC,KAAgB;QAC9D,OAAO,IAAI,6BAAiB,CAAmB,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,QAAQ,CAAyC,KAAgB;QAC7D,OAAO,IAAI,6BAAiB,CAAmB,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,SAAS,CAAyC,KAAgB;QAC9D,OAAO,IAAI,6BAAiB,CAAmB,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,QAAQ,CAAyC,KAAgB;QAC7D,OAAO,IAAI,6BAAiB,CAAmB,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC;CACJ;AAED,kBAAe,UAAU,CAAC"}

package/lib-prod/client/mysql.d.ts

@@ -0,0 +1,5 @@
+import QuerySource from "../builder/query-source";
+import { QueryProcessorOptions } from "./query-processor";
+export default class MySqlQuerySource extends QuerySource {
+    constructor(client: any, options?: QueryProcessorOptions);
+}

package/lib-prod/client/mysql.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const query_source_1 = require("../builder/query-source");
+const query_processor_1 = require("./query-processor");
+class MySqlQuerySource extends query_source_1.default {
+    constructor(client, options = {}) {
+        super((0, query_processor_1.createQueryProcessor)(client, options, 'mysql'));
+    }
+}
+exports.default = MySqlQuerySource;
+//# sourceMappingURL=mysql.js.map

package/lib-prod/client/mysql.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mysql.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAAA,0DAAkD;AAClD,uDAA8E;AAE9E,MAAqB,gBAAiB,SAAQ,sBAAW;IAErD,YAAY,MAAW,EAAE,UAAiC,EAAE;QACxD,KAAK,CAAC,IAAA,sCAAoB,EAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;CACJ;AALD,mCAKC"}

package/lib-prod/client/pg.d.ts

@@ -0,0 +1,5 @@
+import QuerySource from "../builder/query-source";
+import { QueryProcessorOptions } from "./query-processor";
+export default class PgQuerySource extends QuerySource {
+    constructor(client: any, options?: QueryProcessorOptions);
+}

package/lib-prod/client/pg.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const query_source_1 = require("../builder/query-source");
+const query_processor_1 = require("./query-processor");
+class PgQuerySource extends query_source_1.default {
+    constructor(client, options = {}) {
+        super((0, query_processor_1.createQueryProcessor)(client, options, 'pg'));
+    }
+}
+exports.default = PgQuerySource;
+//# sourceMappingURL=pg.js.map

package/lib-prod/client/pg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pg.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAAA,0DAAkD;AAClD,uDAA8E;AAE9E,MAAqB,aAAc,SAAQ,sBAAW;IAElD,YAAY,MAAW,EAAE,UAAiC,EAAE;QACxD,KAAK,CAAC,IAAA,sCAAoB,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;CACJ;AALD,gCAKC"}

package/lib-prod/client/query-processor.d.ts

@@ -0,0 +1,10 @@
+import { QueryEngine } from '../converter/types';
+import { QueryProcessor } from '../builder/helpers/internal-types';
+export interface QueryProcessorOptions {
+    lineBreaks?: boolean;
+    parameterized?: boolean;
+    logging?: boolean;
+    logger?: (sql: string, params?: any[]) => void;
+    identifierQuote?: string;
+}
+export declare function createQueryProcessor(client: any, _options?: QueryProcessorOptions, engine?: QueryEngine): QueryProcessor;

package/lib-prod/client/query-processor.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createQueryProcessor = createQueryProcessor;
+const lib_prod_1 = require("ng2-logger/lib-prod");
+const parameterized_converter_1 = require("../converter/parameterized-converter");
+const sql_converter_1 = require("../converter/sql-converter");
+const log = lib_prod_1.Log.create('query processor');
+const DEFAULT_OPTIONS = {
+    lineBreaks: false,
+    parameterized: true,
+    logging: true,
+    identifierQuote: '"'
+};
+function mySqlTypeCast(field, next) {
+    if (field.type == 'TINY' && field.length == 1) { // Boolean
+        let value = field.string();
+        if (value == '1')
+            return true;
+        if (value == '0')
+            return false;
+        return null;
+    }
+    else if (field.type == 'JSON') {
+        let value = field.string();
+        return value == null ? null : JSON.parse(value);
+    }
+    return next();
+}
+function createQueryProcessor(client, _options = {}, engine = 'pg') {
+    let options = Object.assign({}, DEFAULT_OPTIONS, _options);
+    let queryOptions = {
+        lineBreak: options.lineBreaks ? '\n' : ' ',
+        nameEscape: _options.identifierQuote || (engine === 'mysql' ? '`' : '"')
+    };
+    // function processSql(query: any, sql: string, params: any[] | undefined, callback: any): Promise<any> {
+    //   if (options.logging) log.i(sql);
+    //   if (options.logger) options.logger(sql, params);
+    //   return new Promise((resolve, reject) => {
+    //     callback(sql, params, (err: any, result: any) => {
+    //       if (err) reject(err);
+    //       else resolve(convertResult(query, result, engine));
+    //     });
+    //   });
+    // }
+    // function executeSql(sql: string, params: any[] | undefined, cb: any) {
+    //   if (engine === 'pg') {
+    //     client.query(sql, params || cb, params ? cb : undefined);
+    //   } else if (engine === 'mysql') {
+    //     client.query({
+    //       sql,
+    //       values: params,
+    //       typeCast: mySqlTypeCast
+    //     }, cb);
+    //   } else throw new Error('Unknown DB engine: ' + engine);
+    // }
+    return (query) => {
+        if (options.parameterized) {
+            let { sql, params } = (0, parameterized_converter_1.convertQueryToParameterizedSQL)(query, queryOptions, engine);
+            // if (Helpers.isWebSQL || Helpers.isNode) {
+            return client.query(sql, params);
+            // }
+            // return processSql(query, sql, params, (sql: string, params: any[], cb: any) => executeSql(sql, params, cb));
+        }
+        else {
+            let sql = (0, sql_converter_1.convertQueryToSQL)(query, queryOptions, engine);
+            // if (Helpers.isWebSQL || Helpers.isNode) {
+            return client.query(sql, undefined);
+            // }
+            // return processSql(query, sql, undefined, (sql: string, params: undefined, cb: any) => executeSql(sql, undefined, cb));
+        }
+    };
+}
+//# sourceMappingURL=query-processor.js.map

package/lib-prod/client/query-processor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-processor.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAwCA,oDAgDC;AAxFD,kDAAiD;AACjD,kFAAsF;AACtF,8DAA+D;AAM/D,MAAM,GAAG,GAAG,cAAG,CAAC,MAAM,CAAC,iBAAiB,CAEvC,CAAA;AAUD,MAAM,eAAe,GAA0B;IAC7C,UAAU,EAAE,KAAK;IACjB,aAAa,EAAE,IAAI;IACnB,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,GAAG;CACrB,CAAC;AAEF,SAAS,aAAa,CAAC,KAAU,EAAE,IAAS;IAC1C,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,UAAU;QACzD,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,IAAI,GAAG;YAAE,OAAO,IAAI,CAAC;QAC9B,IAAI,KAAK,IAAI,GAAG;YAAE,OAAO,KAAK,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC;QAChC,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC3B,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB,CAAC,MAAW,EAAE,WAAkC,EAAE,EAAE,SAAsB,IAAI;IAEhH,IAAI,OAAO,GAA0B,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC;IAElF,IAAI,YAAY,GAAqB;QACnC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG;QAC1C,UAAU,EAAE,QAAQ,CAAC,eAAe,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;KACzE,CAAC;IAEF,yGAAyG;IACzG,qCAAqC;IACrC,qDAAqD;IAErD,8CAA8C;IAC9C,yDAAyD;IACzD,8BAA8B;IAC9B,4DAA4D;IAC5D,UAAU;IACV,QAAQ;IACR,IAAI;IAEJ,yEAAyE;IACzE,2BAA2B;IAC3B,gEAAgE;IAChE,qCAAqC;IACrC,qBAAqB;IACrB,aAAa;IACb,wBAAwB;IACxB,gCAAgC;IAChC,cAAc;IACd,4DAA4D;IAC5D,IAAI;IAEJ,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAA,wDAA8B,EAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YAClF,4CAA4C;YAC5C,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACjC,IAAI;YACJ,+GAA+G;QACjH,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,GAAG,IAAA,iCAAiB,EAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;YACzD,4CAA4C;YAC5C,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACpC,IAAI;YACJ,yHAAyH;QAC3H,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/lib-prod/converter/param-converter.d.ts

@@ -0,0 +1,2 @@
+export declare function convertSubstitutionParam(param: any): string;
+export declare function convertEscapedParam(param: any): any;

package/lib-prod/converter/param-converter.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertSubstitutionParam = convertSubstitutionParam;
+exports.convertEscapedParam = convertEscapedParam;
+function convertSubstitutionParam(param) {
+    if (param == null)
+        return 'NULL';
+    if (typeof param === 'string' || param instanceof String) {
+        return `'${String(param)}'`;
+    }
+    else if (typeof param === 'boolean' || param instanceof Boolean) {
+        return String(param).toUpperCase();
+    }
+    else if (param instanceof Date) {
+        return `'${param.toISOString()}'`;
+    }
+    else if (typeof param === 'number' || param instanceof Number) {
+        return String(param);
+    }
+    return `'${JSON.stringify(param)}'`;
+}
+// node mysql doesn't have an typeCast equivalent solution for the other direction
+// node-postgres: https://github.com/brianc/node-postgres/issues/442
+function convertEscapedParam(param) {
+    if (typeof param === 'object' && !(param == null || param instanceof String || param instanceof Number ||
+        param instanceof Boolean || param instanceof Date)) {
+        return JSON.stringify(param);
+    }
+    return param;
+}
+//# sourceMappingURL=param-converter.js.map

package/lib-prod/converter/param-converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"param-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAAA,4DAYC;AAID,kDAMC;AAtBD,SAAgB,wBAAwB,CAAC,KAAU;IAC/C,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,MAAM,CAAC;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QACvD,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC;IAChC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,YAAY,OAAO,EAAE,CAAC;QAChE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;IACvC,CAAC;SAAM,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QAC/B,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,GAAG,CAAC;IACtC,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,YAAY,MAAM,EAAE,CAAC;QAC9D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC;IACD,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC;AACxC,CAAC;AAED,kFAAkF;AAClF,oEAAoE;AACpE,SAAgB,mBAAmB,CAAC,KAAU;IAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,IAAI,KAAK,YAAY,MAAM,IAAI,KAAK,YAAY,MAAM;QAClG,KAAK,YAAY,OAAO,IAAI,KAAK,YAAY,IAAI,CAAC,EAAE,CAAC;QACrD,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}

package/lib-prod/converter/parameterized-converter.d.ts

@@ -0,0 +1,5 @@
+import { QueryEngine, ConverterOptions } from "./types";
+export declare function convertQueryToParameterizedSQL(query: any, options: ConverterOptions, engine: QueryEngine): {
+    sql: string;
+    params: any[];
+};

package/lib-prod/converter/parameterized-converter.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertQueryToParameterizedSQL = convertQueryToParameterizedSQL;
+const query_converter_1 = require("./query-converter");
+const param_converter_1 = require("./param-converter");
+let pgParamConverter = (index) => '$' + index;
+let mySqlParamConverter = (index) => '?';
+function convertSingleParam(param, params, paramConverter) {
+    params.push((0, param_converter_1.convertEscapedParam)(param));
+    return paramConverter(params.length);
+}
+function convertQueryToParameterizedSQL(query, options, engine) {
+    let params = [];
+    let paramConverter = engine === 'mysql' ? mySqlParamConverter : pgParamConverter;
+    let sql = (0, query_converter_1.createQueryConverter)((param) => convertSingleParam(param, params, paramConverter), options, engine)(query);
+    return { sql, params };
+}
+//# sourceMappingURL=parameterized-converter.js.map

package/lib-prod/converter/parameterized-converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parameterized-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAYA,wEAOC;AAnBD,uDAAuD;AACvD,uDAAsD;AAGtD,IAAI,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,CAAC;AACtD,IAAI,mBAAmB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,GAAG,CAAC;AAEjD,SAAS,kBAAkB,CAAC,KAAU,EAAE,MAAa,EAAE,cAAsC;IACzF,MAAM,CAAC,IAAI,CAAC,IAAA,qCAAmB,EAAC,KAAK,CAAC,CAAC,CAAC;IACxC,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACzC,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAyB,EAAE,MAAmB;IACrG,IAAI,MAAM,GAAU,EAAE,CAAC;IAEvB,IAAI,cAAc,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACjF,IAAI,GAAG,GAAG,IAAA,sCAAoB,EAAC,CAAC,KAAU,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;IAE1H,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;AAC3B,CAAC"}

package/lib-prod/converter/query-converter.d.ts

@@ -0,0 +1,2 @@
+import { QueryEngine, ConverterOptions } from "./types";
+export declare function createQueryConverter(paramConverter: (param: any) => string, options: ConverterOptions, engine: QueryEngine): (query: any) => string;

package/lib-prod/converter/query-converter.js

@@ -0,0 +1,284 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createQueryConverter = createQueryConverter;
+const type_converter_1 = require("./type-converter");
+function createQueryConverter(paramConverter, options, engine) {
+    return convertQuery;
+    function convertQuery(query) {
+        if (query._action === 'select')
+            return convertSelectQuery(query);
+        if (query._action === 'delete')
+            return convertDeleteQuery(query);
+        if (query._action === 'update')
+            return convertUpdateQuery(query);
+        if (query._action === 'insert')
+            return convertInsertQuery(query);
+        throw new Error('Unknown query type:' + query._action);
+    }
+    function convertDeleteQuery(query) {
+        let s = 'DELETE FROM ' + convertTable(query._table);
+        s += convertConditions(query._conditions);
+        return s;
+    }
+    function convertUpdateQuery(query) {
+        let s = 'UPDATE ' + convertTable(query._table) + ' SET ';
+        s += convertUpdateSetters(query._table, query._entity);
+        s += convertConditions(query._conditions);
+        return s;
+    }
+    function convertUpdateSetters(table, entity) {
+        return Object.keys(entity).sort().map(key => {
+            let value = entity[key];
+            let column = table[key];
+            return convertColumnName(column) + ' = ' + convertParam(column, value);
+        }).join(', ');
+    }
+    function convertInsertQuery(query) {
+        let items = Array.isArray(query._entity) ? query._entity : [query._entity];
+        let keySet = items.reduce((set, item) => {
+            Object.keys(item).forEach(key => set.add(key));
+            return set;
+        }, new Set());
+        let keys = Array.from(keySet).sort();
+        let s = 'INSERT INTO ' + convertTable(query._table) + ' ';
+        s += '(' + keys.map(key => convertColumnName(query._table[key])).join(', ') + ')';
+        s += options.lineBreak + 'VALUES ';
+        s += items.map(item => convertInsertItem(query._table, item, keys))
+            .map((row) => '(' + row + ')').join(', ');
+        s += getPgInsertReturningIfNeeded(query);
+        return s;
+    }
+    function getPgInsertReturningIfNeeded(query) {
+        if (engine === 'pg' && query._action === 'insert' && !Array.isArray(query._entity) &&
+            query._table.$id && query._table.$id._table && query._table.$id._name) {
+            return ' RETURNING ' + convertColumnName(query._table.$id);
+        }
+        return '';
+    }
+    function convertInsertItem(table, entity, keys) {
+        return keys.map(key => {
+            let value = entity[key];
+            let column = table[key];
+            return convertParam(column, value);
+        }).join(', ');
+    }
+    function convertSelectQuery(query) {
+        let s = 'SELECT ';
+        if (query._distinct) {
+            s += 'DISTINCT ';
+        }
+        if (query._columns == null || query._columns.length === 0) {
+            s += '*';
+        }
+        else {
+            s += query._columns.map((column) => convertColumn(column)).join(', ');
+        }
+        s += options.lineBreak + 'FROM ';
+        if (query._tables) {
+            s += query._tables.map((table) => table._parent ? convertJoin(table) : convertTable(table)).join(', ');
+        }
+        else {
+            s += convertTable(query._table);
+        }
+        s += convertConditions(query._conditions);
+        if (query._groupBy && query._groupBy.length > 0) {
+            s += options.lineBreak + 'GROUP BY ';
+            s += query._groupBy.map((column) => convertColumn(column)).join(', ');
+        }
+        s += convertConditions(query._having, 'HAVING');
+        if (query._orderings && query._orderings.length > 0) {
+            s += options.lineBreak + 'ORDER BY ';
+            s += query._orderings.map((ordering) => convertOrdering(ordering)).join(', ');
+        }
+        if (query._limit != null) {
+            s += options.lineBreak + 'LIMIT ' + (0, type_converter_1.number)(query._limit);
+        }
+        if (query._offset != null) {
+            s += options.lineBreak + 'OFFSET ' + (0, type_converter_1.number)(query._offset);
+        }
+        return s;
+    }
+    function convertConditions(conditions, keyword = 'WHERE') {
+        let s = '';
+        if (conditions && conditions.length > 0) {
+            s += options.lineBreak + keyword + ' ';
+            preprocessConditions(conditions);
+            s += conditions.map(condition => convertCondition(condition, true)).join(' AND ');
+        }
+        return s;
+    }
+    function convertJoin(joinChain) {
+        let items = [];
+        while (joinChain) {
+            items.push(joinChain);
+            joinChain = joinChain._parent;
+        }
+        let root = items[items.length - 1];
+        let s = convertTable(root);
+        for (let i = items.length - 2; i >= 0; i -= 2) {
+            let table = items[i]._table;
+            let modifier = items[i]._modifier;
+            let condition = items[i - 1]._condition;
+            let param = convertColumn(condition._otherColumn);
+            s += ' ' + modifier.toUpperCase() + ' JOIN ' + convertTable(table) + ' ON ' +
+                convertColumnCondition(condition, param);
+        }
+        return s;
+    }
+    function convertOrdering(ordering) {
+        if (ordering._column) {
+            let s = convertColumn(ordering._column);
+            if (ordering._nullsPosition != null) { // "NULLS FIRST" only exists in PG, this is the general solution
+                s += ' IS NULL ' + (ordering._nullsPosition === 'FIRST' ? 'DESC' : 'ASC') + ', ' + s;
+            }
+            if (ordering._direction === 'ASC')
+                s += ' ASC';
+            if (ordering._direction === 'DESC')
+                s += ' DESC';
+            return s;
+        }
+        else {
+            return convertColumn(ordering);
+        }
+    }
+    function convertTable(table) {
+        return options.nameEscape + table._$name + options.nameEscape;
+    }
+    function convertColumn(column) {
+        let s = '';
+        if (!(column._name === '*' && column._modifiers.length > 0 && column._modifiers[0].name === 'count')) {
+            s += convertTable(column._table) + '.';
+        }
+        s += convertColumnName(column);
+        return convertColumnModifiers(s, column);
+    }
+    function convertColumnModifiers(s, column) {
+        if (column._modifiers) {
+            column._modifiers.forEach((modifier) => {
+                let name = modifier.name;
+                if (name === 'lower')
+                    s = 'LOWER(' + s + ')';
+                else if (name === 'upper')
+                    s = 'UPPER(' + s + ')';
+                else if (name === 'count')
+                    s = 'COUNT(' + s + ')';
+                else if (name === 'sum')
+                    s = 'SUM(' + s + ')';
+                else if (name === 'avg')
+                    s = 'AVG(' + s + ')';
+                else if (name === 'min')
+                    s = 'MIN(' + s + ')';
+                else if (name === 'max')
+                    s = 'MAX(' + s + ')';
+                else if (name === 'as')
+                    s = s + ' AS ' + options.nameEscape + modifier.params + options.nameEscape;
+            });
+        }
+        return s + '';
+    }
+    function convertColumnName(column) {
+        if (column._name === '*')
+            return column._name;
+        let name = typeof column._name === 'string' ? column._name : column._name.name;
+        return options.nameEscape + name + options.nameEscape;
+    }
+    function preprocessConditions(conditions) {
+        conditions.forEach(condition => {
+            if (conditions.length > 1 && condition._sibling) {
+                condition._parenthesis = true;
+            }
+            preprocessParams(condition);
+        });
+    }
+    // this is only needed, so that the $1, $2... numbering is not reversed
+    function preprocessParams(condition) {
+        if (condition._sibling) {
+            preprocessParams(condition._sibling);
+        }
+        if (!condition._sibling && !condition._child) {
+            condition.__param = getConditionParam(condition);
+        }
+        if (condition._child) {
+            preprocessParams(condition._child);
+        }
+    }
+    function convertCondition(condition, root = false) {
+        if (!condition._sibling && !condition._child) {
+            return convertColumnCondition(condition, condition.__param);
+        }
+        let s = '';
+        if (condition._child) {
+            s += convertCondition(condition._child);
+        }
+        if (condition._sibling) {
+            s = convertCondition(condition._sibling, root) + ' ' + condition._chainType.toUpperCase() + ' ' + s;
+        }
+        if (condition._parenthesis || ((!root || condition._negation) && condition._child)) {
+            s = '( ' + s + ' )';
+        }
+        if (condition._negation) {
+            s = 'NOT ' + s;
+        }
+        return s;
+    }
+    function convertColumnCondition(condition, param) {
+        let s = convertColumn(condition._column);
+        s += getConditionString(condition, param);
+        return s;
+    }
+    function getConditionString(condition, param) {
+        switch (condition._type) {
+            case 'eq': return ' = ' + param;
+            case 'ne': return ' <> ' + param;
+            case 'lt': return ' < ' + param;
+            case 'gt': return ' > ' + param;
+            case 'lte': return ' <= ' + param;
+            case 'gte': return ' >= ' + param;
+            case 'is-null': return ' IS NULL';
+            case 'is-not-null': return ' IS NOT NULL';
+            case 'like': return ' LIKE ' + param;
+            case 'not-like': return ' NOT LIKE ' + param;
+            case 'in': return ' IN (' + param + ')';
+            case 'not-in': return ' NOT IN (' + param + ')';
+            case 'between': return ' BETWEEN ' + param;
+            case 'not-between': return ' NOT BETWEEN ' + param;
+            default: return '';
+        }
+    }
+    function getConditionParam(condition) {
+        let param = '';
+        if (condition._otherColumn) {
+            param = convertColumn(condition._otherColumn);
+        }
+        else {
+            let _convertParam = (param) => convertParam(condition._column, param);
+            if (condition._type === 'in' || condition._type === 'not-in') {
+                param = condition._values.map((value) => _convertParam(value)).join(', ');
+            }
+            else if (condition._type === 'between' || condition._type === 'not-between') {
+                param = _convertParam(condition._values[0]) + ' AND ' + _convertParam(condition._values[1]);
+            }
+            else if (condition._type !== 'is-null' && condition._type !== 'is-not-null') {
+                param = _convertParam(condition._values[0]);
+            }
+        }
+        return param;
+    }
+    function convertParam(column, param) {
+        if (param == null)
+            return 'NULL';
+        return paramConverter(getTypedParam(column._type, param));
+    }
+    function getTypedParam(type, param) {
+        if (type === 'number')
+            return (0, type_converter_1.number)(param);
+        else if (type === 'boolean')
+            return (0, type_converter_1.boolean)(param);
+        else if (type === 'date')
+            return (0, type_converter_1.date)(param);
+        else if (type === 'string')
+            return (0, type_converter_1.string)(param);
+        return param;
+    }
+}
+//# sourceMappingURL=query-converter.js.map

package/lib-prod/converter/query-converter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-converter.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;AAIA,oDAmSC;AAvSD,qDAAiE;AAIjE,SAAgB,oBAAoB,CAAC,cAAsC,EAAE,OAAyB,EAAE,MAAmB;IAEvH,OAAO,YAAY,CAAC;IAEpB,SAAS,YAAY,CAAC,KAAU;QAC5B,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACjE,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ;YAAE,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,SAAS,kBAAkB,CAAC,KAAU;QAClC,IAAI,CAAC,GAAG,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1C,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,kBAAkB,CAAC,KAAU;QAClC,IAAI,CAAC,GAAG,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;QACzD,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC1C,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,oBAAoB,CAAC,KAAU,EAAE,MAAW;QACjD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACxC,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,iBAAiB,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED,SAAS,kBAAkB,CAAC,KAAU;QAClC,IAAI,KAAK,GAAU,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClF,IAAI,MAAM,GAAgB,KAAK,CAAC,MAAM,CAAC,CAAC,GAAgB,EAAE,IAAI,EAAE,EAAE;YAC9D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAAC,OAAO,GAAG,CAAC;QAC/D,CAAC,EAAE,IAAI,GAAG,EAAU,CAAC,CAAC;QACtB,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QAErC,IAAI,CAAC,GAAG,cAAc,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;QAC1D,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QAClF,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QACnC,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aAC9D,GAAG,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEtD,CAAC,IAAI,4BAA4B,CAAC,KAAK,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC;IACb,CAAC;IAGD,SAAS,4BAA4B,CAAC,KAAU;QAC5C,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YAC9E,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACxE,OAAO,aAAa,GAAG,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,SAAS,iBAAiB,CAAC,KAAU,EAAE,MAAW,EAAE,IAAc;QAC9D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAClB,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YACxB,OAAO,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IAED,SAAS,kBAAkB,CAAC,KAAU;QAClC,IAAI,CAAC,GAAG,SAAS,CAAC;QAClB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YAClB,CAAC,IAAI,WAAW,CAAC;QACrB,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxD,CAAC,IAAI,GAAG,CAAA;QACZ,CAAC;aAAM,CAAC;YACJ,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/E,CAAC;QAED,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;QACjC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAChB,CAAC,IAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/G,CAAC;aAAM,CAAC;YACJ,CAAC,IAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC;YACrC,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/E,CAAC;QACD,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEhD,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClD,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC;YACrC,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvF,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;YACvB,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,QAAQ,GAAG,IAAA,uBAAM,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YACxB,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,GAAG,IAAA,uBAAM,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,iBAAiB,CAAC,UAAiB,EAAE,OAAO,GAAG,OAAO;QAC3D,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,CAAC,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,GAAG,GAAG,CAAC;YACvC,oBAAoB,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,WAAW,CAAC,SAAc;QAC/B,IAAI,KAAK,GAAU,EAAE,CAAC;QACtB,OAAO,SAAS,EAAE,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtB,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC;QAClC,CAAC;QAED,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAE3B,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAG,CAAC,EAAE,CAAC;YAC3C,IAAI,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC5B,IAAI,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAClC,IAAI,SAAS,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;YACxC,IAAI,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAClD,CAAC,IAAI,GAAG,GAAG,QAAQ,CAAC,WAAW,EAAE,GAAG,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,MAAM;gBACvE,sBAAsB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,eAAe,CAAC,QAAa;QAClC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAExC,IAAI,QAAQ,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC,CAAC,gEAAgE;gBACnG,CAAC,IAAI,WAAW,GAAG,CAAC,QAAQ,CAAC,cAAc,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;YACzF,CAAC;YAED,IAAI,QAAQ,CAAC,UAAU,KAAK,KAAK;gBAAE,CAAC,IAAI,MAAM,CAAC;YAC/C,IAAI,QAAQ,CAAC,UAAU,KAAK,MAAM;gBAAE,CAAC,IAAI,OAAO,CAAC;YAEjD,OAAO,CAAC,CAAC;QACb,CAAC;aAAM,CAAC;YACJ,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;IACL,CAAC;IAED,SAAS,YAAY,CAAC,KAAU;QAC5B,OAAO,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAClE,CAAC;IAED,SAAS,aAAa,CAAC,MAAW;QAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,CAAC;YACnG,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC;QAC3C,CAAC;QACD,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC/B,OAAO,sBAAsB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,SAAS,sBAAsB,CAAC,CAAS,EAAE,MAAW;QAClD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAa,EAAE,EAAE;gBACxC,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;gBACzB,IAAI,IAAI,KAAK,OAAO;oBAAE,CAAC,GAAG,QAAQ,GAAG,CAAC,GAAG,GAAG,CAAC;qBACxC,IAAI,IAAI,KAAK,OAAO;oBAAE,CAAC,GAAG,QAAQ,GAAG,CAAC,GAAG,GAAG,CAAC;qBAC7C,IAAI,IAAI,KAAK,OAAO;oBAAE,CAAC,GAAG,QAAQ,GAAG,CAAC,GAAG,GAAG,CAAC;qBAC7C,IAAI,IAAI,KAAK,KAAK;oBAAE,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC;qBACzC,IAAI,IAAI,KAAK,KAAK;oBAAE,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC;qBACzC,IAAI,IAAI,KAAK,KAAK;oBAAE,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC;qBACzC,IAAI,IAAI,KAAK,KAAK;oBAAE,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC;qBACzC,IAAI,IAAI,KAAK,IAAI;oBAAE,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YACvG,CAAC,CAAC,CAAC;QACP,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,SAAS,iBAAiB,CAAC,MAAW;QAClC,IAAI,MAAM,CAAC,KAAK,KAAK,GAAG;YAAE,OAAO,MAAM,CAAC,KAAK,CAAC;QAC9C,IAAI,IAAI,GAAG,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QAC/E,OAAO,OAAO,CAAC,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC;IAC1D,CAAC;IAED,SAAS,oBAAoB,CAAC,UAAiB;QAC3C,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC3B,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBAC9C,SAAS,CAAC,YAAY,GAAG,IAAI,CAAC;YAClC,CAAC;YACD,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,uEAAuE;IACvE,SAAS,gBAAgB,CAAC,SAAc;QACpC,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACrB,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC3C,SAAS,CAAC,OAAO,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnB,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;IACL,CAAC;IAED,SAAS,gBAAgB,CAAC,SAAc,EAAE,IAAI,GAAG,KAAK;QAClD,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC3C,OAAO,sBAAsB,CAAC,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACnB,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACrB,CAAC,GAAG,gBAAgB,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,GAAG,GAAG,SAAS,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;QACxG,CAAC;QACD,IAAI,SAAS,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,SAAS,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACjF,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;YACtB,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,sBAAsB,CAAC,SAAc,EAAE,KAAa;QACzD,IAAI,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC,IAAI,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC1C,OAAO,CAAC,CAAC;IACb,CAAC;IAED,SAAS,kBAAkB,CAAC,SAAc,EAAE,KAAa;QACrD,QAAQ,SAAS,CAAC,KAAK,EAAE,CAAC;YACtB,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,GAAG,KAAK,CAAC;YAChC,KAAK,IAAI,CAAC,CAAC,OAAO,MAAM,GAAG,KAAK,CAAC;YACjC,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,GAAG,KAAK,CAAC;YAChC,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,GAAG,KAAK,CAAC;YAChC,KAAK,KAAK,CAAC,CAAC,OAAO,MAAM,GAAG,KAAK,CAAC;YAClC,KAAK,KAAK,CAAC,CAAC,OAAO,MAAM,GAAG,KAAK,CAAC;YAClC,KAAK,SAAS,CAAC,CAAC,OAAO,UAAU,CAAC;YAClC,KAAK,aAAa,CAAC,CAAC,OAAO,cAAc,CAAC;YAC1C,KAAK,MAAM,CAAC,CAAC,OAAO,QAAQ,GAAG,KAAK,CAAC;YACrC,KAAK,UAAU,CAAC,CAAC,OAAO,YAAY,GAAG,KAAK,CAAC;YAC7C,KAAK,IAAI,CAAC,CAAC,OAAO,OAAO,GAAG,KAAK,GAAG,GAAG,CAAC;YACxC,KAAK,QAAQ,CAAC,CAAC,OAAO,WAAW,GAAG,KAAK,GAAG,GAAG,CAAC;YAChD,KAAK,SAAS,CAAC,CAAC,OAAO,WAAW,GAAG,KAAK,CAAC;YAC3C,KAAK,aAAa,CAAC,CAAC,OAAO,eAAe,GAAG,KAAK,CAAC;YACnD,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;IACL,CAAC;IAED,SAAS,iBAAiB,CAAC,SAAc;QACrC,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,SAAS,CAAC,YAAY,EAAE,CAAC;YACzB,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACJ,IAAI,aAAa,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAE3E,IAAI,SAAS,CAAC,KAAK,KAAK,IAAI,IAAI,SAAS,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC3D,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnF,CAAC;iBAAM,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,IAAI,SAAS,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;gBAC5E,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAChG,CAAC;iBAAM,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,IAAI,SAAS,CAAC,KAAK,KAAK,aAAa,EAAE,CAAC;gBAC5E,KAAK,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,SAAS,YAAY,CAAC,MAAW,EAAE,KAAU;QACzC,IAAI,KAAK,IAAI,IAAI;YAAE,OAAO,MAAM,CAAC;QACjC,OAAO,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,aAAa,CAAC,IAAY,EAAE,KAAU;QAC3C,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAA,uBAAM,EAAC,KAAK,CAAC,CAAC;aACvC,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAA,wBAAO,EAAC,KAAK,CAAC,CAAC;aAC9C,IAAI,IAAI,KAAK,MAAM;YAAE,OAAO,IAAA,qBAAI,EAAC,KAAK,CAAC,CAAC;aACxC,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAA,uBAAM,EAAC,KAAK,CAAC,CAAC;QACjD,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC"}

package/lib-prod/converter/result-converter.d.ts

@@ -0,0 +1,2 @@
+import { QueryEngine } from "./types";
+export declare function convertResult(query: any, result: any, engine: QueryEngine): any;

package/lib-prod/converter/result-converter.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertResult = convertResult;
+function convertResult(query, result, engine) {
+    let rows = engine === 'pg' ? result.rows : result;
+    let rowCount = engine === 'pg' ? result.rowCount : result.affectedRows || result.changedRows;
+    if (query._action === 'select')
+        return convertSelectResult(query, rows);
+    if (query._action === 'delete')
+        return rowCount;
+    if (query._action === 'update')
+        return rowCount;
+    if (query._action === 'insert')
+        return convertInsertResult(result, engine);
+    throw new Error('Unknown query type:' + query._action);
+}
+function convertInsertResult(result, engine) {
+    if (engine === 'mysql')
+        return result.insertId > 0 ? result.insertId : undefined; // mysql returns 0 for tables that have a non-autoincrement ID
+    if (engine === 'pg' && result.rows && result.rows.length === 1) {
+        let columnName = Object.keys(result.rows[0])[0];
+        return result.rows[0][columnName];
+    }
+}
+function convertSelectResult(query, rows) {
+    if (query._columns && query._columns.length === 1 &&
+        !(query._columns[0]._name === '*' && query._columns[0]._modifiers.length === 0)) {
+        if (rows.length == 0)
+            return [];
+        let columnName = Object.keys(rows[0])[0]; // easier than reverse engineering from the column modifiers
+        let values = rows.map((row) => row[columnName]);
+        if (query._columns[0]._name === '*' && query._columns[0]._modifiers.some((m) => m.name === 'count')) {
+            return values.map((value) => Number(value)); // string to number conversion for PG count values
+        }
+        return values;
+    }
+    else {
+        convertAliasFields(query, rows);
+        return rows;
+    }
+}
+function convertAliasFields(query, rows) {
+    let aliasByName = getColumnAliasesByName(query);
+    if (Object.keys(aliasByName).length === 0)
+        return;
+    rows.forEach((row) => {
+        Object.keys(row).forEach((name) => {
+            if (aliasByName[name]) {
+                row[aliasByName[name]] = row[name];
+                delete row[name];
+            }
+        });
+    });
+}
+function getColumnAliasesByName(query) {
+    let aliasByName = {};
+    if (query._columns && query._columns.length > 0) {
+        query._columns.forEach((column) => {
+            if (column._name && column._name.alias && column._modifiers.length === 0) {
+                aliasByName[column._name.name] = column._name.alias;
+            }
+            else if (column._name === '*' && column._modifiers.length === 0) {
+                getAliasColumnsOfTable(column._table).forEach((column) => {
+                    aliasByName[column._name.name] = column._name.alias;
+                });
+            }
+        });
+    }
+    else {
+        let tables = query._table ? [query._table] : query._tables;
+        tables.forEach((table) => {
+            getAliasColumnsOfTable(table).forEach((column) => {
+                aliasByName[column._name.name] = column._name.alias;
+            });
+            let joinTable = table._parent;
+            while (joinTable) {
+                getAliasColumnsOfTable(joinTable).forEach((column) => {
+                    aliasByName[column._name.name] = column._name.alias;
+                });
+                joinTable = joinTable._parent;
+            }
+        });
+    }
+    return aliasByName;
+}
+function getAliasColumnsOfTable(table) {
+    return Object.keys(table).map(key => table[key]).filter((column) => column && column._name && column._name.alias);
+}
+//# sourceMappingURL=result-converter.js.map