pogi 2.11.0

package/lib/pgTable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgTable.js","sourceRoot":"","sources":["../src/pgTable.ts"],"names":[],"mappings":"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"}

package/lib/pgUtils.d.ts

@@ -0,0 +1,31 @@
+import { QueryOptions, ResultFieldType, QueryAble } from "./queryAble";
+import { FieldType } from "./pgDb";
+import { PgDbLogger } from "./pgDbLogger";
+export declare let pgUtils: {
+    logError(logger: PgDbLogger, options: {
+        error?: string | Error;
+        sql: string;
+        params: any;
+        connection;
+    }): void;
+    quoteField(f: any): any;
+    processQueryFields(options: QueryOptions): string;
+    processNamedParams(sql: string, params: Object): {
+        sql: string;
+        params: any[];
+    };
+    processQueryOptions(options: QueryOptions): string;
+    transformInsertUpdateParams(param: any, fieldType: FieldType): any;
+    postProcessResult(res: any[], fields: ResultFieldType[], pgdbTypeParsers: {
+        [oid: number]: (s: string) => any;
+    }): void;
+    convertTypes(res: any[], fields: ResultFieldType[], pgdbTypeParsers: {
+        [oid: number]: (s: string) => any;
+    }): void;
+    createFunctionCaller(q: QueryAble, fn: {
+        schema: string;
+        name: string;
+        return_single_row: boolean;
+        return_single_value: boolean;
+    }): (...args: any[]) => Promise<any>;
+};

package/lib/pgUtils.js

@@ -0,0 +1,157 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pgUtils = void 0;
+const tslib_1 = require("tslib");
+const pgDb_1 = require("./pgDb");
+const _ = require("lodash");
+const util = require('util');
+const NAMED_PARAMS_REGEXP = /(?:^|[^:]):(!?[a-zA-Z0-9_]+)/g;
+const ASC_DESC_REGEXP = /^([^" (]+)( asc| desc)?$/;
+exports.pgUtils = {
+    logError(logger, options) {
+        let { error, sql, params, connection } = options;
+        logger.error(error, sql, util.inspect(logger.paramSanitizer ? logger.paramSanitizer(params) : params, false, null), connection ? connection.processID : null);
+    },
+    quoteField(f) {
+        return f.indexOf('"') == -1 && f.indexOf('(') == -1 ? '"' + f + '"' : f;
+    },
+    processQueryFields(options) {
+        let s = options && options.distinct ? ' DISTINCT ' : ' ';
+        if (options && options.fields) {
+            if (Array.isArray(options.fields)) {
+                return s + options.fields.map(exports.pgUtils.quoteField).join(', ');
+            }
+            else {
+                return s + options.fields;
+            }
+        }
+        else {
+            return s + ' *';
+        }
+    },
+    processNamedParams(sql, params) {
+        let sql2 = [];
+        let params2 = [];
+        let p = NAMED_PARAMS_REGEXP.exec(sql);
+        let lastIndex = 0;
+        while (p) {
+            let ddl = false;
+            let name = p[1];
+            if (name[0] == '!') {
+                name = name.slice(1);
+                ddl = true;
+            }
+            if (!(name in params)) {
+                throw new Error(`No ${p[1]} in params (keys: ${Object.keys(params)})`);
+            }
+            sql2.push(sql.slice(lastIndex, NAMED_PARAMS_REGEXP.lastIndex - p[1].length - 1));
+            if (ddl) {
+                sql2.push('"' + ('' + params[name]).replace(/"/g, '""') + '"');
+            }
+            else {
+                params2.push(params[name]);
+                sql2.push('$' + params2.length);
+            }
+            lastIndex = NAMED_PARAMS_REGEXP.lastIndex;
+            p = NAMED_PARAMS_REGEXP.exec(sql);
+        }
+        sql2.push(sql.substr(lastIndex));
+        return {
+            sql: sql2.join(''),
+            params: params2
+        };
+    },
+    processQueryOptions(options) {
+        options = options || {};
+        let sql = '';
+        if (options.groupBy) {
+            if (Array.isArray(options.groupBy)) {
+                sql += ' GROUP BY ' + options.groupBy.map(exports.pgUtils.quoteField).join(',');
+            }
+            else {
+                sql += ' GROUP BY ' + exports.pgUtils.quoteField(options.groupBy);
+            }
+        }
+        if (options.orderBy) {
+            if (typeof options.orderBy == 'string') {
+                sql += ' ORDER BY ' + exports.pgUtils.quoteField(options.orderBy);
+            }
+            else if (Array.isArray(options.orderBy)) {
+                let orderBy = options.orderBy.map(v => v[0] == '+' ? exports.pgUtils.quoteField(v.substr(1, v.length - 1)) + ' asc' :
+                    v[0] == '-' ? exports.pgUtils.quoteField(v.substr(1, v.length - 1)) + ' desc' :
+                        v.replace(ASC_DESC_REGEXP, '"$1"$2'));
+                sql += ' ORDER BY ' + orderBy.join(',');
+            }
+            else {
+                let orderBy = [];
+                _.forEach(options.orderBy, (v, k) => orderBy.push(exports.pgUtils.quoteField(k) + ' ' + v));
+                sql += ' ORDER BY ' + orderBy.join(',');
+            }
+        }
+        if (options.limit) {
+            sql += util.format(' LIMIT %d', options.limit);
+        }
+        if (options.offset) {
+            sql += util.format(' OFFSET %d', options.offset);
+        }
+        if (options.forUpdate) {
+            sql += ' FOR UPDATE';
+        }
+        return sql;
+    },
+    transformInsertUpdateParams(param, fieldType) {
+        return (param != null && fieldType == pgDb_1.FieldType.JSON) ? JSON.stringify(param) :
+            (param != null && fieldType == pgDb_1.FieldType.TIME && !(param instanceof Date)) ? new Date(param) : param;
+    },
+    postProcessResult(res, fields, pgdbTypeParsers) {
+        if (res) {
+            if (res[0] && !Array.isArray(res[0])) {
+                if (Object.keys(res[0]).length != fields.length) {
+                    throw Error("Name collision for the query, two or more fields have the same name.");
+                }
+            }
+            exports.pgUtils.convertTypes(res, fields, pgdbTypeParsers);
+        }
+    },
+    convertTypes(res, fields, pgdbTypeParsers) {
+        let isArrayMode = Array.isArray(res[0]);
+        fields.forEach((field, i) => {
+            if (pgdbTypeParsers[field.dataTypeID]) {
+                if (isArrayMode) {
+                    res.forEach(e => e[i] = e[i] == null ? null : pgdbTypeParsers[field.dataTypeID](e[i]));
+                }
+                else {
+                    res.forEach(e => e[field.name] = e[field.name] == null ? null : pgdbTypeParsers[field.dataTypeID](e[field.name]));
+                }
+            }
+        });
+    },
+    createFunctionCaller(q, fn) {
+        return (...args) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let placeHolders = [];
+            let params = [];
+            args.forEach((arg) => {
+                placeHolders.push('$' + (placeHolders.length + 1));
+                params.push(arg);
+            });
+            let res = yield q.query(`SELECT "${fn.schema}"."${fn.name}"(${placeHolders.join(',')})`, params);
+            if (fn.return_single_value) {
+                let keys = res[0] ? Object.keys(res[0]) : [];
+                if (keys.length != 1) {
+                    throw Error(`Return type error. schema: ${fn.schema} fn: ${fn.name} expected return type: single value, current value:` + JSON.stringify(res));
+                }
+                res = res.map((r) => r[keys[0]]);
+            }
+            if (fn.return_single_row) {
+                if (res.length != 1) {
+                    throw Error(`Return type error. schema: ${fn.schema} fn: ${fn.name} expected return type: single value, current value:` + JSON.stringify(res));
+                }
+                return res[0];
+            }
+            else {
+                return res;
+            }
+        });
+    }
+};
+//# sourceMappingURL=pgUtils.js.map

package/lib/pgUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgUtils.js","sourceRoot":"","sources":["../src/pgUtils.ts"],"names":[],"mappings":";;;;AACA,iCAAiC;AAEjC,4BAA4B;AAE5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,mBAAmB,GAAG,+BAA+B,CAAC;AAC5D,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAExC,QAAA,OAAO,GAAG;IAEjB,QAAQ,CAAC,MAAkB,EAAE,OAAuE;QAChG,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACjD,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAClK,CAAC;IAED,UAAU,CAAC,CAAC;QACR,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,kBAAkB,CAAC,OAAqB;QACpC,IAAI,CAAC,GAAG,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC;QACzD,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;YAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC/B,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,eAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAChE;iBAAM;gBACH,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;aAC7B;SACJ;aAAM;YACH,OAAO,CAAC,GAAG,IAAI,CAAC;SACnB;IACL,CAAC;IAOD,kBAAkB,CAAC,GAAW,EAAE,MAAc;QAC1C,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,IAAI,OAAO,GAAG,EAAE,CAAC;QAEjB,IAAI,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,OAAO,CAAC,EAAE;YACN,IAAI,GAAG,GAAG,KAAK,CAAC;YAChB,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE;gBAChB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,GAAG,GAAG,IAAI,CAAC;aACd;YAED,IAAI,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aAC1E;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,mBAAmB,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;YAEjF,IAAI,GAAG,EAAE;gBACL,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;aAClE;iBAAM;gBACH,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;aACnC;YACD,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAC1C,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACrC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAEjC,OAAO;YACH,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClB,MAAM,EAAE,OAAO;SAClB,CAAA;IACL,CAAC;IAED,mBAAmB,CAAC,OAAqB;QACrC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,IAAI,GAAG,GAAG,EAAE,CAAC;QAEb,IAAI,OAAO,CAAC,OAAO,EAAE;YACjB,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBAChC,GAAG,IAAI,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3E;iBAAM;gBACH,GAAG,IAAI,YAAY,GAAG,eAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAC7D;SACJ;QACD,IAAI,OAAO,CAAC,OAAO,EAAE;YACjB,IAAI,OAAO,OAAO,CAAC,OAAO,IAAI,QAAQ,EAAE;gBACpC,GAAG,IAAI,YAAY,GAAG,eAAO,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aAC7D;iBACI,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACrC,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAClC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,eAAO,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;oBAClE,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,eAAO,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;wBACnE,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAClD,GAAG,IAAI,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3C;iBAAM;gBACH,IAAI,OAAO,GAAG,EAAE,CAAC;gBACjB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,eAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpF,GAAG,IAAI,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC3C;SACJ;QACD,IAAI,OAAO,CAAC,KAAK,EAAE;YACf,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;SAClD;QACD,IAAI,OAAO,CAAC,MAAM,EAAE;YAChB,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;SACpD;QACD,IAAI,OAAO,CAAC,SAAS,EAAC;YAClB,GAAG,IAAI,aAAa,CAAC;SACxB;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAQD,2BAA2B,CAAC,KAAU,EAAE,SAAoB;QACxD,OAAO,CAAC,KAAK,IAAI,IAAI,IAAI,SAAS,IAAI,gBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3E,CAAC,KAAK,IAAI,IAAI,IAAI,SAAS,IAAI,gBAAS,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7G,CAAC;IAED,iBAAiB,CAAC,GAAU,EAAE,MAAyB,EAAE,eAAqD;QAC1G,IAAI,GAAG,EAAE;YACL,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;gBAClC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;oBAC7C,MAAM,KAAK,CAAC,sEAAsE,CAAC,CAAC;iBACvF;aACJ;YACD,eAAO,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;SACtD;IACL,CAAC;IAED,YAAY,CAAC,GAAU,EAAE,MAAyB,EAAE,eAAqD;QACrG,IAAI,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACxB,IAAI,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;gBACnC,IAAI,WAAW,EAAE;oBACb,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC1F;qBAAM;oBACH,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACrH;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB,CAAC,CAAY,EAAE,EAA8F;QAC7H,OAAO,CAAO,GAAG,IAAI,EAAE,EAAE;YACrB,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACjB,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBACnD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,MAAM,MAAM,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAEjG,IAAI,EAAE,CAAC,mBAAmB,EAAE;gBACxB,IAAI,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC7C,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE;oBAClB,MAAM,KAAK,CAAC,8BAA8B,EAAE,CAAC,MAAM,QAAQ,EAAE,CAAC,IAAI,qDAAqD,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;iBACjJ;gBACD,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACpC;YACD,IAAI,EAAE,CAAC,iBAAiB,EAAE;gBACtB,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE;oBACjB,MAAM,KAAK,CAAC,8BAA8B,EAAE,CAAC,MAAM,QAAQ,EAAE,CAAC,IAAI,qDAAqD,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;iBACjJ;gBACD,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC;aACjB;iBAAM;gBACH,OAAO,GAAG,CAAC;aACd;QACL,CAAC,CAAA,CAAA;IACL,CAAC;CACJ,CAAC"}

package/lib/queryAble.d.ts

@@ -0,0 +1,76 @@
+/// <reference types="node" />
+import { PgDbLogger } from "./pgDbLogger";
+import * as stream from "stream";
+export interface QueryOptions {
+    limit?: number;
+    offset?: number;
+    orderBy?: string | string[] | {
+        [fieldName: string]: 'asc' | 'desc';
+    };
+    groupBy?: string | string[];
+    fields?: string | string[];
+    logger?: PgDbLogger;
+    forUpdate?: boolean;
+    distinct?: boolean;
+    skipUndefined?: boolean;
+}
+export interface SqlQueryOptions {
+    logger?: PgDbLogger;
+}
+export interface ResultFieldType {
+    name: string;
+    tableID: number;
+    columnID: number;
+    dataTypeID: number;
+    dataTypeSize: number;
+    dataTypeModifier: number;
+    format: string;
+}
+export interface ResultType {
+    command: 'SELECT' | 'UPDATE' | 'DELETE';
+    rowCount: number;
+    oid: number;
+    rows: any[];
+    fields: ResultFieldType[];
+    _parsers: Function[][];
+    RowCtor: Function[];
+    rowsAsArray: boolean;
+    _getTypeParser: Function[];
+}
+export interface PgRowResult {
+    columns: string[];
+    rows: any[];
+}
+export declare class QueryAble {
+    db: any;
+    schema: any;
+    protected logger: PgDbLogger;
+    constructor();
+    setLogger(logger: PgDbLogger): void;
+    getLogger(useConsoleAsDefault?: boolean): any;
+    run(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>;
+    query(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>;
+    protected internalQuery(options: {
+        connection: any;
+        sql: string;
+        params?: any;
+        logger?: any;
+    }): Promise<any[]>;
+    protected internalQuery(options: {
+        connection: any;
+        sql: string;
+        params?: any;
+        logger?: any;
+        rowMode: true;
+    }): Promise<PgRowResult>;
+    queryAsRows(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<PgRowResult>;
+    queryWithOnCursorCallback(sql: string, params: any[] | {}, options: SqlQueryOptions, callback: (any: any) => any): Promise<void>;
+    queryAsStream(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<stream.Readable>;
+    queryOne(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>;
+    queryFirst(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>;
+    queryOneField(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any>;
+    queryOneColumn(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>;
+    private postProcessFields;
+    private checkAndFixOids;
+    private hasUnknownOids;
+}

package/lib/queryAble.js

@@ -0,0 +1,330 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryAble = void 0;
+const tslib_1 = require("tslib");
+const pgUtils_1 = require("./pgUtils");
+const util = require('util');
+const QueryStream = require('pg-query-stream');
+const through = require('through');
+let defaultLogger = {
+    log: () => { },
+    error: () => { }
+};
+class QueryAble {
+    constructor() {
+    }
+    setLogger(logger) {
+        this.logger = logger;
+    }
+    getLogger(useConsoleAsDefault = false) {
+        return this.logger || this.schema && this.schema.logger || this.db.logger || (useConsoleAsDefault ? console : defaultLogger);
+    }
+    run(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            return this.query(sql, params, options);
+        });
+    }
+    query(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let connection = this.db.connection;
+            let logger = (options && options.logger || this.getLogger(false));
+            return this.internalQuery({ connection, sql, params, logger });
+        });
+    }
+    internalQuery(options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.db.needToFixConnectionForListen()) {
+                yield this.db.runRestartConnectionForListen();
+            }
+            let { connection, sql, params, logger } = options;
+            logger = logger || this.getLogger(false);
+            try {
+                if (params && !Array.isArray(params)) {
+                    let p = pgUtils_1.pgUtils.processNamedParams(sql, params);
+                    sql = p.sql;
+                    params = p.params;
+                }
+                if (connection) {
+                    logger.log('reused connection', sql, util.inspect(params, false, null), connection.processID);
+                    let res = yield connection.query({ text: sql, values: params, rowMode: (options === null || options === void 0 ? void 0 : options.rowMode) ? 'array' : undefined });
+                    yield this.checkAndFixOids(connection, res.fields);
+                    this.postProcessFields(res.rows, res.fields, logger);
+                    return (options === null || options === void 0 ? void 0 : options.rowMode) ? { columns: (res.fields || []).map(f => f.name), rows: res.rows || [] } : res.rows;
+                }
+                else {
+                    connection = yield this.db.pool.connect();
+                    logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
+                    connection.on('error', (err) => { });
+                    let res = yield connection.query({ text: sql, values: params, rowMode: (options === null || options === void 0 ? void 0 : options.rowMode) ? 'array' : undefined });
+                    yield this.checkAndFixOids(connection, res.fields);
+                    connection.release();
+                    connection = null;
+                    this.postProcessFields(res.rows, res.fields, logger);
+                    return (options === null || options === void 0 ? void 0 : options.rowMode) ? { columns: (res.fields || []).map(f => f.name), rows: res.rows || [] } : res.rows;
+                }
+            }
+            catch (e) {
+                pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
+                if (connection) {
+                    try {
+                        connection.release();
+                    }
+                    catch (e) {
+                        logger.error('connection error', e.message);
+                    }
+                }
+                throw e;
+            }
+        });
+    }
+    queryAsRows(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let connection = this.db.connection;
+            let logger = (options && options.logger || this.getLogger(false));
+            return this.internalQuery({ connection, sql, params, logger, rowMode: true });
+        });
+    }
+    queryWithOnCursorCallback(sql, params, options, callback) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.db.needToFixConnectionForListen()) {
+                yield this.db.runRestartConnectionForListen();
+            }
+            let connection = this.db.connection;
+            let logger = this.getLogger(true);
+            try {
+                if (params && !Array.isArray(params)) {
+                    let p = pgUtils_1.pgUtils.processNamedParams(sql, params);
+                    sql = p.sql;
+                    params = p.params;
+                }
+                let queryInternal = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    this.getLogger(false).log(sql, util.inspect(params, false, null), connection.processID);
+                    let fieldsToFix;
+                    let isFirst = true;
+                    let query = new QueryStream(sql, params);
+                    let stream = connection.query(query);
+                    yield new Promise((resolve, reject) => {
+                        query.handleError = (err, connection) => {
+                            reject(err);
+                        };
+                        stream.on('data', (res) => {
+                            try {
+                                let fields = stream._result && stream._result.fields || stream.cursor._result && stream.cursor._result.fields;
+                                if (isFirst) {
+                                    if (this.hasUnknownOids(fields)) {
+                                        fieldsToFix = fields;
+                                        stream.destroy();
+                                        return;
+                                    }
+                                    isFirst = false;
+                                }
+                                this.postProcessFields([res], fields, this.getLogger(false));
+                                if (callback(res)) {
+                                    stream.destroy();
+                                }
+                            }
+                            catch (e) {
+                                reject(e);
+                            }
+                        });
+                        stream.on('close', resolve);
+                        stream.on('error', reject);
+                    });
+                    if (fieldsToFix) {
+                        yield this.checkAndFixOids(connection, fieldsToFix);
+                        query = new QueryStream(sql, params);
+                        stream = connection.query(query);
+                        yield new Promise((resolve, reject) => {
+                            query.handleError = (err, connection) => {
+                                reject(err);
+                            };
+                            stream.on('data', (res) => {
+                                try {
+                                    let fields = stream._result && stream._result.fields || stream.cursor._result && stream.cursor._result.fields;
+                                    this.postProcessFields([res], fields, this.getLogger(false));
+                                    if (callback(res)) {
+                                        stream.destroy();
+                                    }
+                                }
+                                catch (e) {
+                                    reject(e);
+                                }
+                            });
+                            stream.on('close', resolve);
+                            stream.on('error', reject);
+                        });
+                    }
+                });
+                if (connection) {
+                    yield queryInternal();
+                }
+                else {
+                    connection = yield this.db.pool.connect();
+                    logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
+                    connection.on('error', (err) => { });
+                    yield queryInternal();
+                    connection.release();
+                    connection = null;
+                }
+            }
+            catch (e) {
+                pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
+                if (connection) {
+                    try {
+                        connection.release();
+                    }
+                    catch (e) {
+                        logger.error('connection error', e.message);
+                    }
+                }
+                throw e;
+            }
+        });
+    }
+    queryAsStream(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.db.needToFixConnectionForListen()) {
+                yield this.db.runRestartConnectionForListen();
+            }
+            let connection = this.db.connection;
+            let logger = (options && options.logger || this.getLogger(false));
+            let pgStream;
+            let queriable = this;
+            let isFirst = true;
+            let convertTypeFilter = through(function (data) {
+                try {
+                    let fields = pgStream._result && pgStream._result.fields || pgStream.cursor._result && pgStream.cursor._result.fields;
+                    if (isFirst) {
+                        if (queriable.hasUnknownOids(fields)) {
+                            throw new Error('[337] Query returns fields with unknown oid.');
+                        }
+                        isFirst = false;
+                    }
+                    queriable.postProcessFields([data], fields, queriable.db.pgdbTypeParsers);
+                    this.emit('data', data);
+                }
+                catch (err) {
+                    this.emit('error', err);
+                }
+            });
+            convertTypeFilter.on('error', (e) => {
+                if (connection) {
+                    try {
+                        connection.release();
+                    }
+                    catch (e) {
+                        logger.error('connection error', e.message);
+                    }
+                }
+                connection = null;
+                pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
+            });
+            try {
+                if (params && !Array.isArray(params)) {
+                    let p = pgUtils_1.pgUtils.processNamedParams(sql, params);
+                    sql = p.sql;
+                    params = p.params;
+                }
+                if (connection) {
+                    logger.log(sql, util.inspect(params, false, null), connection.processID);
+                    let query = new QueryStream(sql, params);
+                    query.handleError = (err, connection) => {
+                        convertTypeFilter.emit('error', err);
+                    };
+                    pgStream = connection.query(query);
+                    return pgStream.pipe(convertTypeFilter);
+                }
+                else {
+                    connection = yield this.db.pool.connect();
+                    logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
+                    connection.on('error', (err) => { });
+                    let query = new QueryStream(sql, params);
+                    query.handleError = (err, connection) => {
+                        convertTypeFilter.emit('error', err);
+                    };
+                    pgStream = connection.query(query);
+                    pgStream.on('close', () => {
+                        if (connection)
+                            connection.release();
+                        connection = null;
+                    });
+                    pgStream.on('error', (e) => {
+                        pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
+                        if (connection)
+                            connection.release();
+                        connection = null;
+                    });
+                    return pgStream.pipe(convertTypeFilter);
+                }
+            }
+            catch (e) {
+                pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
+                throw e;
+            }
+        });
+    }
+    queryOne(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let res = yield this.query(sql, params, options);
+            if (res.length > 1) {
+                let logger = (options && options.logger || this.getLogger(false));
+                let error = Error('More then one rows exists');
+                pgUtils_1.pgUtils.logError(logger, { error, sql, params, connection: this.db.connection });
+                throw error;
+            }
+            return res[0];
+        });
+    }
+    queryFirst(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let res = yield this.query(sql, params, options);
+            return res[0];
+        });
+    }
+    queryOneField(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let res = yield this.query(sql, params, options);
+            if (!res.length) {
+                return null;
+            }
+            let fieldName = Object.keys(res[0])[0];
+            if (res.length > 1) {
+                let logger = (options && options.logger || this.getLogger(false));
+                let error = Error('More then one field exists!');
+                pgUtils_1.pgUtils.logError(logger, { error, sql, params, connection: this.db.connection });
+                throw error;
+            }
+            return res.length == 1 ? res[0][fieldName] : null;
+        });
+    }
+    queryOneColumn(sql, params, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let res = yield this.query(sql, params, options);
+            if (!res.length) {
+                return [];
+            }
+            let fieldName = Object.keys(res[0])[0];
+            return res.map(r => r[fieldName]);
+        });
+    }
+    postProcessFields(rows, fields, logger) {
+        pgUtils_1.pgUtils.postProcessResult(rows, fields, this.db.pgdbTypeParsers);
+        if (this.db.postProcessResult)
+            this.db.postProcessResult(rows, fields, logger);
+    }
+    checkAndFixOids(connection, fields) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (fields) {
+                let oidList = fields.map(field => field.dataTypeID);
+                return this.db.resetMissingParsers(connection, oidList);
+            }
+        });
+    }
+    hasUnknownOids(fields) {
+        let oidList = fields.map(field => field.dataTypeID);
+        let unknownOids = oidList.filter(oid => !this.db.knownOids[oid]);
+        return !!unknownOids.length;
+    }
+}
+exports.QueryAble = QueryAble;
+//# sourceMappingURL=queryAble.js.map