pogi 3.0.0-beta → 3.0.0-beta2

package/lib/pgTable.js

@@ -2,26 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgTable = void 0;
 const tslib_1 = require("tslib");
+const _ = require("lodash");
+const pgUtils_1 = require("./pgUtils");
 const queryAble_1 = require("./queryAble");
 const queryWhere_1 = require("./queryWhere");
-const pgUtils_1 = require("./pgUtils");
-const _ = require("lodash");
-const util = require('util');
 class PgTable extends queryAble_1.QueryAble {
     constructor(schema, desc, fieldTypes = {}) {
         super();
         this.schema = schema;
         this.desc = desc;
         this.db = schema.db;
-        this.qualifiedName = util.format('"%s"."%s"', desc.schema, desc.name);
+        this.qualifiedName = `${pgUtils_1.pgUtils.quoteFieldName(desc.schema)}.${pgUtils_1.pgUtils.quoteFieldName(desc.name)}`;
         this.pkey = desc.pkey || desc.name + "_pkey";
         this.fieldTypes = fieldTypes;
+        return this;
     }
     toString() {
         return this.qualifiedName;
     }
     insert(records, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
             if (!records) {
                 throw new Error("insert should be called with data");
@@ -39,7 +39,7 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     insertAndGet(records, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let returnSingle = false;
             options = options || {};
             if (!records) {
@@ -53,7 +53,7 @@ class PgTable extends queryAble_1.QueryAble {
                 return [];
             }
             let { sql, parameters } = this.getInsertQuery(records);
-            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldNameInsecure).join(',') : '*');
+            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldName).join(',') : '*');
             let result = yield this.query(sql, parameters, { logger: options.logger });
             if (options.return && options.return.length == 0) {
                 return new Array(returnSingle ? 1 : records.length).fill({});
@@ -68,7 +68,7 @@ class PgTable extends queryAble_1.QueryAble {
     }
     ;
     updateOne(conditions, fields, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let affected = yield this.update(conditions, fields, options);
             if (affected > 1) {
                 throw new Error('More then one record has been updated!');
@@ -77,7 +77,7 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     updateAndGetOne(conditions, fields, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let result = yield this.updateAndGet(conditions, fields, options);
             if (result.length > 1) {
                 throw new Error('More then one record has been updated!');
@@ -86,7 +86,7 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     update(conditions, fields, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let { sql, parameters } = this.getUpdateQuery(conditions, fields, options);
             sql = "WITH __RESULT as ( " + sql + " RETURNING 1) SELECT SUM(1) FROM __RESULT";
             let res = yield this.query(sql, parameters, options);
@@ -95,15 +95,15 @@ class PgTable extends queryAble_1.QueryAble {
     }
     ;
     updateAndGet(conditions, fields, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let { sql, parameters } = this.getUpdateQuery(conditions, fields, options);
-            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldNameInsecure).join(',') : '*');
+            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldName).join(',') : '*');
             return this.query(sql, parameters, options);
         });
     }
     ;
     upsert(record, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
             if (!record) {
                 throw new Error("insert should be called with data");
@@ -116,13 +116,13 @@ class PgTable extends queryAble_1.QueryAble {
     }
     ;
     upsertAndGet(record, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
             if (!record) {
                 throw new Error("insert should be called with data");
             }
             let { sql, parameters } = this.getUpsertQuery(record, options);
-            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldNameInsecure).join(',') : '*');
+            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldName).join(',') : '*');
             let result = yield this.query(sql, parameters, { logger: options.logger });
             if (options.return && options.return.length == 0) {
                 return {};
@@ -132,7 +132,7 @@ class PgTable extends queryAble_1.QueryAble {
     }
     ;
     delete(conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let { sql, parameters } = this.getDeleteQuery(conditions, options);
             sql = "WITH __RESULT as ( " + sql + " RETURNING 1) SELECT SUM(1) FROM __RESULT";
             let res = yield this.query(sql, parameters, options);
@@ -140,7 +140,7 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     deleteOne(conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let affected = yield this.delete(conditions, options);
             if (affected > 1) {
                 throw new Error('More then one record has been deleted!');
@@ -149,15 +149,15 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     deleteAndGet(conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
             let { sql, parameters } = this.getDeleteQuery(conditions, options);
-            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldNameInsecure).join(',') : '*');
+            sql += " RETURNING " + (options && options.return && Array.isArray(options.return) ? options.return.map(pgUtils_1.pgUtils.quoteFieldName).join(',') : '*');
             return this.query(sql, parameters);
         });
     }
     deleteAndGetOne(conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let result = yield this.deleteAndGet(conditions, options);
             if (result.length > 1) {
                 throw new Error('More then one record has been deleted!');
@@ -166,7 +166,7 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     truncate(options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             let sql = `TRUNCATE ${this.qualifiedName}`;
             if (options && options.restartIdentity) {
                 sql += ' RESTART IDENTITY';
@@ -174,37 +174,37 @@ class PgTable extends queryAble_1.QueryAble {
             if (options && options.cascade) {
                 sql += ' CASCADE';
             }
-            yield this.query(sql, null, options);
+            yield this.query(sql, undefined, options);
         });
     }
     find(conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
-            options.skipUndefined = options.skipUndefined === true || (options.skipUndefined === undefined && ['all', 'select'].indexOf(this.db.config.skipUndefined) > -1);
+            options.skipUndefined = options.skipUndefined === true || (options.skipUndefined === undefined && this.db.config.skipUndefined && ['all', 'select'].includes(this.db.config.skipUndefined));
             let where = _.isEmpty(conditions) ? {
-                where: " ",
-                params: null
-            } : queryWhere_1.default(conditions, this.fieldTypes, this.qualifiedName, 0, options.skipUndefined);
-            let sql = `SELECT ${pgUtils_1.pgUtils.processQueryFields(options)} FROM ${this.qualifiedName} ${where.where} ${pgUtils_1.pgUtils.processQueryOptions(options)}`;
+                where: "",
+                params: undefined
+            } : (0, queryWhere_1.default)(conditions, this.fieldTypes, this.qualifiedName, 0, options.skipUndefined);
+            let sql = `SELECT ${pgUtils_1.pgUtils.processQueryFields(options)} FROM ${this.qualifiedName} ${where.where} ${pgUtils_1.pgUtils.processQueryOptions(options, this)}`;
             return options.stream ? this.queryAsStream(sql, where.params, options) : this.query(sql, where.params, options);
         });
     }
     findWhere(where, params, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
-            let sql = `SELECT ${pgUtils_1.pgUtils.processQueryFields(options)} FROM ${this.qualifiedName} WHERE ${where} ${pgUtils_1.pgUtils.processQueryOptions(options)}`;
+            let sql = `SELECT ${pgUtils_1.pgUtils.processQueryFields(options)} FROM ${this.qualifiedName} WHERE ${where} ${pgUtils_1.pgUtils.processQueryOptions(options, this)}`;
             return options.stream ? this.queryAsStream(sql, params, options) : this.query(sql, params, options);
         });
     }
     findAll(options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
-            let sql = `SELECT ${pgUtils_1.pgUtils.processQueryFields(options)} FROM ${this.qualifiedName} ${pgUtils_1.pgUtils.processQueryOptions(options)}`;
-            return options.stream ? this.queryAsStream(sql, null, options) : this.query(sql, null, options);
+            let sql = `SELECT ${pgUtils_1.pgUtils.processQueryFields(options)} FROM ${this.qualifiedName} ${pgUtils_1.pgUtils.processQueryOptions(options, this)}`;
+            return options.stream ? this.queryAsStream(sql, undefined, options) : this.query(sql, null, options);
         });
     }
     findOne(conditions, 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.find(conditions, options);
             if (res.length > 1) {
                 let logger = (options && options.logger || this.getLogger(false));
@@ -216,7 +216,7 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     findFirst(conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
             options.limit = 1;
             let res = yield this.find(conditions, options);
@@ -224,19 +224,19 @@ class PgTable extends queryAble_1.QueryAble {
         });
     }
     count(conditions, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
-            options.skipUndefined = options.skipUndefined === true || (options.skipUndefined === undefined && ['all', 'select'].indexOf(this.db.config.skipUndefined) > -1);
+            options.skipUndefined = options.skipUndefined === true || (options.skipUndefined === undefined && this.db.config.skipUndefined && ['all', 'select'].includes(this.db.config.skipUndefined));
             let where = _.isEmpty(conditions) ? {
                 where: " ",
-                params: null
-            } : queryWhere_1.default(conditions, this.fieldTypes, this.qualifiedName, 0, options.skipUndefined);
+                params: undefined
+            } : (0, queryWhere_1.default)(conditions, this.fieldTypes, this.qualifiedName, 0, options.skipUndefined);
             let sql = `SELECT COUNT(*) c FROM ${this.qualifiedName} ${where.where}`;
             return (yield this.queryOneField(sql, where.params));
         });
     }
     findOneFieldOnly(conditions, field, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             options = options || {};
             options.fields = [field];
             let res = yield this.findOne(conditions, options);
@@ -251,27 +251,27 @@ class PgTable extends queryAble_1.QueryAble {
             }
         });
         let columns = Object.keys(columnsMap);
-        let sql = util.format("INSERT INTO %s (%s) VALUES\n", this.qualifiedName, columns.map(pgUtils_1.pgUtils.quoteFieldNameInsecure).join(", "));
+        let sql = `INSERT INTO ${this.qualifiedName} (${columns.map(pgUtils_1.pgUtils.quoteFieldName).join(", ")}) VALUES\n`;
         let parameters = [];
         let placeholders = [];
         for (let i = 0, seed = 0; i < records.length; i++) {
             placeholders.push('(' + columns.map(c => "$" + (++seed)).join(', ') + ')');
-            parameters.push.apply(parameters, columns.map(c => pgUtils_1.pgUtils.transformInsertUpdateParams(records[i][c], this.fieldTypes[c])));
+            parameters.push(...columns.map(c => pgUtils_1.pgUtils.transformInsertUpdateParams(records[i][c], this.fieldTypes[c])));
         }
         sql += placeholders.join(",\n");
         return { sql, parameters };
     }
-    getUpdateSetSnipplet(fields, parameters) {
+    getUpdateSetSnippet(fields, parameters) {
         let params = parameters || [];
         let f = [];
         let seed = params.length;
         _.each(fields, (value, fieldName) => {
             if (value === undefined)
                 return;
-            f.push(util.format('%s = $%s', pgUtils_1.pgUtils.quoteFieldNameInsecure(fieldName), (++seed)));
+            f.push(`${pgUtils_1.pgUtils.quoteFieldName(fieldName)} = $${(++seed)}`);
             params.push(pgUtils_1.pgUtils.transformInsertUpdateParams(value, this.fieldTypes[fieldName]));
         });
-        return { snipplet: f.join(', '), parameters: params };
+        return { snippet: f.join(', '), parameters: params };
     }
     getUpdateQuery(conditions, fields, options) {
         options = options || {};
@@ -280,10 +280,10 @@ class PgTable extends queryAble_1.QueryAble {
         if (_.isEmpty(fields)) {
             throw new Error('Missing fields for update');
         }
-        let { snipplet, parameters } = this.getUpdateSetSnipplet(fields);
-        let sql = util.format("UPDATE %s SET %s", this.qualifiedName, snipplet);
+        let { snippet, parameters } = this.getUpdateSetSnippet(fields);
+        let sql = `UPDATE ${this.qualifiedName} SET ${snippet}`;
         if (!hasConditions || !_.isEmpty(conditions)) {
-            let parsedWhere = queryWhere_1.default(conditions, this.fieldTypes, this.qualifiedName, parameters.length, options.skipUndefined);
+            let parsedWhere = (0, queryWhere_1.default)(conditions, this.fieldTypes, this.qualifiedName, parameters.length, options.skipUndefined);
             sql += parsedWhere.where;
             parameters = parameters.concat(parsedWhere.params);
         }
@@ -295,24 +295,24 @@ class PgTable extends queryAble_1.QueryAble {
             throw new Error('Missing fields for upsert');
         }
         let insert = this.getInsertQuery([record]);
-        let { snipplet, parameters } = this.getUpdateSetSnipplet(record, insert.parameters);
+        let { snippet, parameters } = this.getUpdateSetSnippet(record, insert.parameters);
         let sql = insert.sql;
         if (options.columns) {
-            sql += " ON CONFLICT (" + options.columns.map(c => pgUtils_1.pgUtils.quoteFieldNameInsecure(c)).join(', ') + ") DO UPDATE SET " + snipplet;
+            sql += ` ON CONFLICT (${options.columns.map(c => pgUtils_1.pgUtils.quoteFieldName(c)).join(', ')}) DO UPDATE SET ${snippet}`;
         }
         else {
-            let constraint = options.constraint || this.pkey;
-            sql += " ON CONFLICT ON CONSTRAINT " + util.format('"%s"', constraint) + " DO UPDATE SET " + snipplet;
+            let constraint = pgUtils_1.pgUtils.quoteFieldName(options.constraint || this.pkey);
+            sql += ` ON CONFLICT ON CONSTRAINT ${constraint} DO UPDATE SET ${snippet}`;
         }
         return { sql, parameters };
     }
     getDeleteQuery(conditions, options) {
         options = options || {};
         options.skipUndefined = options.skipUndefined === true || (options.skipUndefined === undefined && this.db.config.skipUndefined === 'all');
-        let sql = util.format("DELETE FROM %s ", this.qualifiedName);
+        let sql = `DELETE FROM ${this.qualifiedName} `;
         let parsedWhere;
         if (!_.isEmpty(conditions)) {
-            parsedWhere = queryWhere_1.default(conditions, this.fieldTypes, this.qualifiedName, 0, options.skipUndefined);
+            parsedWhere = (0, queryWhere_1.default)(conditions, this.fieldTypes, this.qualifiedName, 0, options.skipUndefined);
             sql += parsedWhere.where;
         }
         return { sql, parameters: parsedWhere && parsedWhere.params || [] };

package/lib/pgTable.js.map

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

package/lib/{src/pgTableInterface.d.ts → pgTableInterface.d.ts}

@@ -95,8 +95,8 @@ export interface IPgTable<T> extends IQueryAble {
     findAll(options?: QueryOptions): Promise<T[]>;
     findAll(options?: QueryOptions & Stream): Promise<stream.Readable>;
     findAll(options?: any): Promise<any>;
-    findOne(conditions: any, options?: QueryOptions): Promise<T>;
-    findFirst(conditions: any, options?: QueryOptions): Promise<T>;
+    findOne(conditions: Record<string, any>, options?: QueryOptions): Promise<T>;
+    findFirst(conditions: Record<string, any>, options?: QueryOptions): Promise<T>;
     count(conditions?: {}, options?: CountOption): Promise<number>;
-    findOneFieldOnly(conditions: any, field: string, options?: QueryOptions): Promise<any>;
+    findOneFieldOnly(conditions: Record<string, any>, field: string, options?: QueryOptions): Promise<any>;
 }

package/lib/pgTableInterface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pgTableInterface.js","sourceRoot":"","sources":["../src/pgTableInterface.ts"],"names":[],"mappings":";;AAQA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC"}

package/lib/pgUtils.d.ts

@@ -1,22 +1,29 @@
-import { QueryOptions, ResultFieldType, QueryAble } from "./queryAble";
+import { QueryOptions, IQueryAble } from "./queryAbleInterface";
+import { ResultFieldType } from "./pgDbInterface";
 import { FieldType } from "./pgDb";
 import { PgDbLogger } from "./pgDbLogger";
+import { IPgTable } from "./pgTableInterface";
+import * as pg from 'pg';
 export declare let pgUtils: {
     logError(logger: PgDbLogger, options: {
         error?: string | Error;
         sql: string;
         params: any;
-        connection;
+        connection?: pg.PoolClient | null;
     }): void;
     quoteFieldNameInsecure(f: string): string;
     quoteFieldName(f: string): string;
+    quoteFieldNameOrPositionInsecure(f: string | number): string;
     quoteFieldNameOrPosition(f: string | number): string;
-    processQueryFields(options: QueryOptions): string;
+    quoteFieldNameJsonbOrPosition(f: string | number): string;
+    processQueryFields<T>(options: QueryOptions, pgTable?: IPgTable<T> | undefined): string;
     processNamedParams(sql: string, params: Object): {
         sql: string;
         params: any[];
     };
-    processQueryOptions(options: QueryOptions): string;
+    handleColumnEscapeGroupBy<T_1>(options: QueryOptions, pgTable?: IPgTable<T_1> | undefined): string;
+    handleColumnEscapeOrderBy<T_2>(options: QueryOptions, pgTable: IPgTable<T_2>): string;
+    processQueryOptions<T_3>(options: QueryOptions, pgTable: IPgTable<T_3>): string;
     transformInsertUpdateParams(param: any, fieldType: FieldType): any;
     postProcessResult(res: any[], fields: ResultFieldType[], pgdbTypeParsers: {
         [oid: number]: (s: string) => any;
@@ -24,10 +31,11 @@ export declare let pgUtils: {
     convertTypes(res: any[], fields: ResultFieldType[], pgdbTypeParsers: {
         [oid: number]: (s: string) => any;
     }): void;
-    createFunctionCaller(q: QueryAble, fn: {
+    createFunctionCaller(q: IQueryAble, fn: {
         schema: string;
         name: string;
         return_single_row: boolean;
         return_single_value: boolean;
     }): (...args: any[]) => Promise<any>;
+    escapeForLike(s: string): string;
 };