pogi 3.0.0-beta → 3.0.0-beta2

package/lib/pgUtils.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const pgDb_1 = require("./pgDb");
 const util = require("util");
 const NAMED_PARAMS_REGEXP = /(?:^|[^:]):(!?[a-zA-Z0-9_]+)/g;
-const ASC_DESC_REGEXP = /^(.+?)(?:\s+(asc|desc))?$/i;
+const ASC_DESC_REGEXP = /^\s*(.+?)(?:\s+(asc|desc))?\s*$/i;
 exports.pgUtils = {
     logError(logger, options) {
         let { error, sql, params, connection } = options;
@@ -25,26 +25,61 @@ exports.pgUtils = {
             throw new Error(`Invalid field: ${f}`);
         }
     },
+    quoteFieldNameOrPositionInsecure(f) {
+        if (Number.isInteger(+f)) {
+            if (!Number.isInteger(+f) || +f < 1)
+                throw new Error(`Invalid field: ${f}`);
+            return '' + f;
+        }
+        else if (typeof f === 'string' && f.length) {
+            return f.indexOf('"') == -1 && f.indexOf('(') == -1 ? '"' + f + '"' : f;
+        }
+        else {
+            throw new Error(`Invalid field: ${f}`);
+        }
+    },
     quoteFieldNameOrPosition(f) {
-        if (typeof f === 'string' && f.length) {
+        if (Number.isInteger(+f)) {
+            if (!Number.isInteger(+f) || +f < 1)
+                throw new Error(`Invalid field: ${f}`);
+            return '' + f;
+        }
+        else if (typeof f === 'string' && f.length) {
             return `"${f
-                .replace(/^\s*"*/, '')
-                .replace(/"*\s*$/, '')
+                .replace(/^\s*"*\s*/, '')
+                .replace(/\s*"*\s*$/, '')
                 .replace(/"/g, '""')}"`;
         }
-        else if (typeof f === 'number') {
-            if (!Number.isInteger(f) || f < 1)
-                throw new Error(`Invalid field: ${f}`);
+        else {
+            throw new Error(`Invalid field: ${f}`);
+        }
+    },
+    quoteFieldNameJsonbOrPosition(f) {
+        if (Number.isInteger(+f)) {
             return '' + f;
         }
+        if (typeof f === 'string' && f.length) {
+            return `'${f
+                .replace(/^\s*'*/, '')
+                .replace(/'*\s*$/, '')
+                .replace(/'/g, "''")}'`;
+        }
         else {
             throw new Error(`Invalid field: ${f}`);
         }
     },
-    processQueryFields(options) {
+    processQueryFields(options, pgTable) {
+        var _a, _b, _c;
+        let escapeColumns = (((pgTable === null || pgTable === void 0 ? void 0 : pgTable.db.config.forceEscapeColumns) === true || ((_a = pgTable === null || pgTable === void 0 ? void 0 : pgTable.db.config.forceEscapeColumns) === null || _a === void 0 ? void 0 : _a.select) === true)
+            && options.forceEscapeColumns !== false && ((_b = options.forceEscapeColumns) === null || _b === void 0 ? void 0 : _b.select) !== false)
+            || options.forceEscapeColumns === true
+            || ((_c = options.forceEscapeColumns) === null || _c === void 0 ? void 0 : _c.select);
         let s = options && options.distinct ? ' DISTINCT ' : ' ';
         if (options && options.fields) {
             if (Array.isArray(options.fields)) {
+                if (escapeColumns) {
+                    return s + options.fields.map(exports.pgUtils.quoteFieldName).join(', ');
+                }
                 return s + options.fields.map(exports.pgUtils.quoteFieldNameInsecure).join(', ');
             }
             else {
@@ -72,7 +107,7 @@ exports.pgUtils = {
             }
             sql2.push(sql.slice(lastIndex, NAMED_PARAMS_REGEXP.lastIndex - p[1].length - 1));
             if (ddl) {
-                sql2.push('"' + ('' + params[name]).replace(/"/g, '""') + '"');
+                sql2.push(exports.pgUtils.quoteFieldName(params[name]));
             }
             else {
                 params2.push(params[name]);
@@ -81,27 +116,51 @@ exports.pgUtils = {
             lastIndex = NAMED_PARAMS_REGEXP.lastIndex;
             p = NAMED_PARAMS_REGEXP.exec(sql);
         }
-        sql2.push(sql.substr(lastIndex));
+        sql2.push(sql.slice(lastIndex));
         return {
             sql: sql2.join(''),
             params: params2
         };
     },
-    processQueryOptions(options) {
-        options = options || {};
-        let sql = '';
-        if (options.groupBy) {
+    handleColumnEscapeGroupBy(options, pgTable) {
+        var _a, _b, _c;
+        if (!options.groupBy)
+            return '';
+        let escapeColumns = (((pgTable === null || pgTable === void 0 ? void 0 : pgTable.db.config.forceEscapeColumns) === true || ((_a = pgTable === null || pgTable === void 0 ? void 0 : pgTable.db.config.forceEscapeColumns) === null || _a === void 0 ? void 0 : _a.groupBy) === true)
+            && options.forceEscapeColumns !== false && ((_b = options.forceEscapeColumns) === null || _b === void 0 ? void 0 : _b.groupBy) !== false)
+            || options.forceEscapeColumns === true
+            || ((_c = options.forceEscapeColumns) === null || _c === void 0 ? void 0 : _c.groupBy);
+        if (escapeColumns) {
             if (Array.isArray(options.groupBy)) {
-                sql += ' GROUP BY ' + options.groupBy.map(exports.pgUtils.quoteFieldNameOrPosition).join(',');
+                return ' GROUP BY ' + options.groupBy.map(exports.pgUtils.quoteFieldNameOrPosition).join(',');
             }
             else {
-                sql += ' GROUP BY ' + exports.pgUtils.quoteFieldNameOrPosition(options.groupBy);
+                return ' GROUP BY ' + exports.pgUtils.quoteFieldNameOrPosition(options.groupBy);
             }
         }
-        if (options.orderBy) {
-            let orderBy = typeof options.orderBy === 'string' ? options.orderBy.split(',') : options.orderBy;
-            if (Array.isArray(orderBy)) {
-                let orderBy2 = orderBy.map(v => {
+        else {
+            if (Array.isArray(options.groupBy)) {
+                return ' GROUP BY ' + options.groupBy.map(exports.pgUtils.quoteFieldNameOrPositionInsecure).join(',');
+            }
+            else {
+                return ' GROUP BY ' + exports.pgUtils.quoteFieldNameOrPositionInsecure(options.groupBy);
+            }
+        }
+    },
+    handleColumnEscapeOrderBy(options, pgTable) {
+        var _a, _b, _c;
+        if (!options.orderBy)
+            return '';
+        let sql = '';
+        let escapeColumns = (((pgTable === null || pgTable === void 0 ? void 0 : pgTable.db.config.forceEscapeColumns) === true || ((_a = pgTable === null || pgTable === void 0 ? void 0 : pgTable.db.config.forceEscapeColumns) === null || _a === void 0 ? void 0 : _a.orderBy) === true)
+            && options.forceEscapeColumns !== false && ((_b = options.forceEscapeColumns) === null || _b === void 0 ? void 0 : _b.orderBy) !== false)
+            || options.forceEscapeColumns === true
+            || ((_c = options.forceEscapeColumns) === null || _c === void 0 ? void 0 : _c.orderBy);
+        let orderBy = typeof options.orderBy === 'string' ? options.orderBy.split(',') : options.orderBy;
+        if (Array.isArray(orderBy)) {
+            let orderBy2;
+            if (escapeColumns) {
+                orderBy2 = orderBy.map(v => {
                     var _a;
                     if (typeof v === 'number')
                         return exports.pgUtils.quoteFieldNameOrPosition(v);
@@ -116,10 +175,41 @@ exports.pgUtils = {
                         throw new Error(`Invalid orderBy: ${v}`);
                     return `${exports.pgUtils.quoteFieldNameOrPosition(o[1])} ${(_a = o[2]) !== null && _a !== void 0 ? _a : ''}`;
                 });
-                sql += ' ORDER BY ' + orderBy2.join(',');
             }
             else {
-                throw new Error(`Invalid orderBy: ${options.orderBy}`);
+                orderBy2 = orderBy.map(v => {
+                    var _a;
+                    if (typeof v === 'number')
+                        return exports.pgUtils.quoteFieldNameOrPositionInsecure(v);
+                    else if (typeof v !== 'string' || !v.length)
+                        throw new Error(`Invalid orderBy: ${v}`);
+                    if (v[0] == '+')
+                        return exports.pgUtils.quoteFieldNameOrPositionInsecure(v.slice(1));
+                    if (v[0] == '-')
+                        return exports.pgUtils.quoteFieldNameOrPositionInsecure(v.slice(1)) + ' desc';
+                    let o = ASC_DESC_REGEXP.exec(v);
+                    if (!o)
+                        throw new Error(`Invalid orderBy: ${v}`);
+                    return `${exports.pgUtils.quoteFieldNameOrPositionInsecure(o[1])} ${(_a = o[2]) !== null && _a !== void 0 ? _a : ''}`;
+                });
+            }
+            sql += ' ORDER BY ' + orderBy2.join(',');
+        }
+        else {
+            throw new Error(`Invalid orderBy: ${options.orderBy}`);
+        }
+        return sql;
+    },
+    processQueryOptions(options, pgTable) {
+        options = options || {};
+        let sql = '';
+        if (options.groupBy) {
+            sql += exports.pgUtils.handleColumnEscapeGroupBy(options, pgTable);
+        }
+        if (options.orderBy) {
+            sql += exports.pgUtils.handleColumnEscapeOrderBy(options, pgTable);
+            if (options.orderByNullsFirst != null) {
+                sql += ' NULLS ' + options.orderByNullsFirst ? 'FIRST' : 'LAST';
             }
         }
         if (options.limit) {
@@ -165,7 +255,7 @@ exports.pgUtils = {
         });
     },
     createFunctionCaller(q, fn) {
-        return (...args) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (...args) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let placeHolders = [];
             let params = [];
             args.forEach((arg) => {
@@ -190,6 +280,9 @@ exports.pgUtils = {
                 return res;
             }
         });
+    },
+    escapeForLike(s) {
+        return s.replace(/([\\%_])/g, '\\$1');
     }
 };
 //# sourceMappingURL=pgUtils.js.map

package/lib/pgUtils.js.map

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

package/lib/queryAble.d.ts

@@ -1,83 +1,35 @@
 /// <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 type PostProcessResultFunc = (res: any[], fields: ResultFieldType[], logger: PgDbLogger) => void;
-export interface IPgDb {
-    connection: any;
-    pool: any;
-    pgdbTypeParsers: any;
-    knownOids: Record<number, boolean>;
-    runRestartConnectionForListen(): Promise<Error>;
-    needToFixConnectionForListen(): boolean;
-    postProcessResult: PostProcessResultFunc;
-    resetMissingParsers(connection: any, oidList: number[]): Promise<void>;
-}
-export declare class QueryAble {
-    db: IPgDb & QueryAble;
-    schema: any;
-    protected logger: PgDbLogger;
+import { IPgSchema } from "./pgSchemaInterface";
+import * as pg from 'pg';
+import { IPgDb } from "./pgDbInterface";
+import { SqlQueryOptions, IQueryAble, PgRowResult } from "./queryAbleInterface";
+export declare abstract class QueryAble implements IQueryAble {
+    db: IPgDb & IQueryAble;
+    schema: IPgSchema;
+    logger: PgDbLogger;
     static connectionErrorListener: () => void;
-    constructor();
     setLogger(logger: PgDbLogger): void;
-    getLogger(useConsoleAsDefault?: boolean): any;
+    getLogger(useConsoleAsDefault?: boolean): PgDbLogger;
     run(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>;
-    query(sql: string, params?: any[] | {}, options?: SqlQueryOptions): Promise<any[]>;
+    query(sql: string, params?: any[] | {} | null, options?: SqlQueryOptions): Promise<any[]>;
     protected internalQuery(options: {
-        connection: any;
+        connection: pg.PoolClient | null;
         sql: string;
         params?: any;
-        logger?: any;
+        logger?: PgDbLogger;
     }): Promise<any[]>;
     protected internalQuery(options: {
-        connection: any;
+        connection: pg.PoolClient | null;
         sql: string;
         params?: any;
-        logger?: any;
+        logger?: PgDbLogger;
         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>;
+    queryWithOnCursorCallback(sql: string, params: any[] | Record<string, any> | null, options: SqlQueryOptions | null, callback: (res: any) => any): Promise<void>;
+    queryAsStream(sql: string, params?: any[] | Record<string, any> | null, options?: SqlQueryOptions | null): 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>;

package/lib/queryAble.js

@@ -3,16 +3,14 @@ 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');
+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;
     }
@@ -20,19 +18,19 @@ class QueryAble {
         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 (0, 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* () {
+        return (0, 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* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             if (this.db.needToFixConnectionForListen()) {
                 yield this.db.runRestartConnectionForListen();
             }
@@ -44,25 +42,25 @@ class QueryAble {
                     sql = p.sql;
                     params = p.params;
                 }
+                let query = (options === null || options === void 0 ? void 0 : options.rowMode) ? { text: sql, values: params, rowMode: 'array' } : { text: sql, values: params };
+                let res;
                 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 });
+                    res = yield connection.query(query);
                     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', QueryAble.connectionErrorListener);
-                    let res = yield connection.query({ text: sql, values: params, rowMode: (options === null || options === void 0 ? void 0 : options.rowMode) ? 'array' : undefined });
+                    res = yield connection.query(query);
                     yield this.checkAndFixOids(connection, res.fields);
                     connection.off('error', QueryAble.connectionErrorListener);
                     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;
                 }
+                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 });
@@ -79,35 +77,37 @@ class QueryAble {
         });
     }
     queryAsRows(sql, params, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, 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* () {
+        return (0, 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);
+            let positionedParams;
             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);
+                else {
+                    positionedParams = params;
+                }
+                let queryInternal = () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+                    this.getLogger(false).log(sql, util.inspect(positionedParams, false, null), connection.processID);
                     let fieldsToFix;
                     let isFirst = true;
-                    let query = new QueryStream(sql, params);
+                    let query = new QueryStream(sql, positionedParams);
                     let stream = connection.query(query);
                     yield new Promise((resolve, reject) => {
-                        query.handleError = (err, connection) => {
-                            reject(err);
-                        };
+                        query.handleError = reject;
                         stream.on('data', (res) => {
                             try {
                                 let fields = stream._result && stream._result.fields || stream.cursor._result && stream.cursor._result.fields;
@@ -133,12 +133,10 @@ class QueryAble {
                     });
                     if (fieldsToFix) {
                         yield this.checkAndFixOids(connection, fieldsToFix);
-                        query = new QueryStream(sql, params);
+                        query = new QueryStream(sql, positionedParams);
                         stream = connection.query(query);
                         yield new Promise((resolve, reject) => {
-                            query.handleError = (err, connection) => {
-                                reject(err);
-                            };
+                            query.handleError = reject;
                             stream.on('data', (res) => {
                                 try {
                                     let fields = stream._result && stream._result.fields || stream.cursor._result && stream.cursor._result.fields;
@@ -161,12 +159,11 @@ class QueryAble {
                 }
                 else {
                     connection = yield this.db.pool.connect();
-                    logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
+                    logger.log('new connection', sql, util.inspect(positionedParams, false, null), connection.processID);
                     connection.on('error', QueryAble.connectionErrorListener);
                     yield queryInternal();
                     connection.off('error', QueryAble.connectionErrorListener);
                     connection.release();
-                    connection = null;
                 }
             }
             catch (e) {
@@ -184,7 +181,7 @@ class QueryAble {
         });
     }
     queryAsStream(sql, params, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             if (this.db.needToFixConnectionForListen()) {
                 yield this.db.runRestartConnectionForListen();
             }
@@ -221,16 +218,20 @@ class QueryAble {
                 connection = null;
                 pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
             });
+            let positionedParams;
             try {
                 if (params && !Array.isArray(params)) {
                     let p = pgUtils_1.pgUtils.processNamedParams(sql, params);
                     sql = p.sql;
                     params = p.params;
                 }
+                else {
+                    positionedParams = params;
+                }
                 if (connection) {
-                    logger.log(sql, util.inspect(params, false, null), connection.processID);
-                    let query = new QueryStream(sql, params);
-                    query.handleError = (err, connection) => {
+                    logger.log(sql, util.inspect(positionedParams, false, null), connection.processID);
+                    let query = new QueryStream(sql, positionedParams);
+                    query.handleError = (err) => {
                         convertTypeFilter.emit('error', err);
                     };
                     pgStream = connection.query(query);
@@ -238,10 +239,10 @@ class QueryAble {
                 }
                 else {
                     connection = yield this.db.pool.connect();
-                    logger.log('new connection', sql, util.inspect(params, false, null), connection.processID);
+                    logger.log('new connection', sql, util.inspect(positionedParams, false, null), connection.processID);
                     connection.on('error', QueryAble.connectionErrorListener);
-                    let query = new QueryStream(sql, params);
-                    query.handleError = (err, connection) => {
+                    let query = new QueryStream(sql, positionedParams);
+                    query.handleError = (err, _connection) => {
                         convertTypeFilter.emit('error', err);
                     };
                     pgStream = connection.query(query);
@@ -253,7 +254,7 @@ class QueryAble {
                         connection = null;
                     });
                     pgStream.on('error', (e) => {
-                        pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
+                        pgUtils_1.pgUtils.logError(logger, { error: e, sql, params: positionedParams, connection });
                         if (connection) {
                             connection.off('error', QueryAble.connectionErrorListener);
                             connection.release();
@@ -264,13 +265,13 @@ class QueryAble {
                 }
             }
             catch (e) {
-                pgUtils_1.pgUtils.logError(logger, { error: e, sql, params, connection });
+                pgUtils_1.pgUtils.logError(logger, { error: e, sql, params: positionedParams, connection });
                 throw e;
             }
         });
     }
     queryOne(sql, params, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, 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));
@@ -282,13 +283,13 @@ class QueryAble {
         });
     }
     queryFirst(sql, params, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, 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* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let res = yield this.query(sql, params, options);
             if (!res.length) {
                 return null;
@@ -304,7 +305,7 @@ class QueryAble {
         });
     }
     queryOneColumn(sql, params, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let res = yield this.query(sql, params, options);
             if (!res.length) {
                 return [];
@@ -319,7 +320,7 @@ class QueryAble {
             this.db.postProcessResult(rows, fields, logger);
     }
     checkAndFixOids(connection, fields) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             if (fields) {
                 let oidList = fields.map(field => field.dataTypeID);
                 return this.db.resetMissingParsers(connection, oidList);