af-db-ts 2.0.19 → 2.0.73

package/dist/cjs/src/ms/utils-ms.js

@@ -0,0 +1,92 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getJsTypeByTypeMs = void 0;
+const sql = __importStar(require("mssql"));
+const getJsTypeByTypeMs = (dataType, arrayType) => {
+    switch (dataType) {
+        case 'boolean':
+        case sql.Bit:
+            return 'boolean';
+        case 'bigint':
+        case sql.BigInt:
+            return 'string | number';
+        case 'tinyint':
+        case sql.TinyInt:
+        case 'smallint':
+        case sql.SmallInt:
+        case 'int':
+        case 'integer':
+        case sql.Int:
+        case 'number':
+        case sql.Decimal:
+        case sql.Float:
+        case sql.Money:
+        case sql.Numeric:
+        case sql.SmallMoney:
+        case sql.Real:
+            return 'number';
+        case 'string':
+        case sql.Char:
+        case sql.NChar:
+        case sql.Text:
+        case sql.NText:
+        case sql.VarChar:
+        case sql.NVarChar:
+        case sql.Xml:
+        case 'uid':
+        case 'uuid':
+        case 'uniqueIdentifier':
+        case sql.UniqueIdentifier:
+            return 'string';
+        case 'datetime':
+        case 'date':
+        case 'time':
+        case sql.DateTime:
+        case sql.DateTime2:
+        case sql.Time:
+        case sql.Date:
+        case sql.SmallDateTime:
+        case sql.DateTimeOffset:
+            return 'string | Date | number';
+        case sql.Binary:
+        case sql.VarBinary:
+        case sql.Image:
+            return 'any';
+        case sql.UDT:
+        case sql.Geography:
+        case sql.Geometry:
+        case sql.Variant:
+            return 'any';
+        case 'array': {
+            const jsType = (0, exports.getJsTypeByTypeMs)(arrayType);
+            return `${jsType}[]`;
+        }
+        default:
+            return 'string';
+    }
+};
+exports.getJsTypeByTypeMs = getJsTypeByTypeMs;
+//# sourceMappingURL=utils-ms.js.map

package/dist/cjs/src/ms/utils-ms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils-ms.js","sourceRoot":"","sources":["../../../../src/ms/utils-ms.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAGtB,MAAM,iBAAiB,GAAG,CAAC,QAAsB,EAAE,SAAuB,EAAU,EAAE;IAC3F,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,GAAG,CAAC,GAAG;YACV,OAAO,SAAS,CAAC;QAEnB,KAAK,QAAQ,CAAC;QACd,KAAK,GAAG,CAAC,MAAM;YACb,OAAO,iBAAiB,CAAC;QAE3B,KAAK,SAAS,CAAC;QACf,KAAK,GAAG,CAAC,OAAO,CAAC;QACjB,KAAK,UAAU,CAAC;QAChB,KAAK,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,KAAK,CAAC;QACX,KAAK,SAAS,CAAC;QACf,KAAK,GAAG,CAAC,GAAG,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,GAAG,CAAC,OAAO,CAAC;QACjB,KAAK,GAAG,CAAC,KAAK,CAAC;QACf,KAAK,GAAG,CAAC,KAAK,CAAC;QACf,KAAK,GAAG,CAAC,OAAO,CAAC;QACjB,KAAK,GAAG,CAAC,UAAU,CAAC;QACpB,KAAK,GAAG,CAAC,IAAI;YACX,OAAO,QAAQ,CAAC;QAElB,KAAK,QAAQ,CAAC;QACd,KAAK,GAAG,CAAC,IAAI,CAAC;QACd,KAAK,GAAG,CAAC,KAAK,CAAC;QACf,KAAK,GAAG,CAAC,IAAI,CAAC;QACd,KAAK,GAAG,CAAC,KAAK,CAAC;QACf,KAAK,GAAG,CAAC,OAAO,CAAC;QACjB,KAAK,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,GAAG,CAAC,GAAG,CAAC;QACb,KAAK,KAAK,CAAC;QACX,KAAK,MAAM,CAAC;QACZ,KAAK,kBAAkB,CAAC;QACxB,KAAK,GAAG,CAAC,gBAAgB;YACvB,OAAO,QAAQ,CAAC;QAElB,KAAK,UAAU,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,GAAG,CAAC,SAAS,CAAC;QACnB,KAAK,GAAG,CAAC,IAAI,CAAC;QACd,KAAK,GAAG,CAAC,IAAI,CAAC;QACd,KAAK,GAAG,CAAC,aAAa,CAAC;QACvB,KAAK,GAAG,CAAC,cAAc;YACrB,OAAO,wBAAwB,CAAC;QAElC,KAAK,GAAG,CAAC,MAAM,CAAC;QAChB,KAAK,GAAG,CAAC,SAAS,CAAC;QACnB,KAAK,GAAG,CAAC,KAAK;YACZ,OAAO,KAAK,CAAC;QAEf,KAAK,GAAG,CAAC,GAAG,CAAC;QACb,KAAK,GAAG,CAAC,SAAS,CAAC;QACnB,KAAK,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,GAAG,CAAC,OAAO;YACd,OAAO,KAAK,CAAC;QACf,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,IAAA,yBAAiB,EAAC,SAAS,CAAC,CAAC;YAC5C,OAAO,GAAG,MAAM,IAAI,CAAC;QACvB,CAAC;QACD;YACE,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC,CAAC;AApEW,QAAA,iBAAiB,qBAoE5B"}

package/dist/cjs/src/ms/wrap-transaction-ms.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapTransactionMs = void 0;
+/**
+ * Оборачивает инструкции SQL в транзакцию
+ */
+const wrapTransactionMs = (strSQL) => `BEGIN TRY
+    BEGIN TRANSACTION;
+
+    ${strSQL}
+
+    COMMIT TRANSACTION;
+END TRY
+BEGIN CATCH
+    DECLARE @ErrorMessage  NVARCHAR(MAX)
+          , @ErrorSeverity INT
+          , @ErrorState    INT;
+
+    SELECT
+        @ErrorMessage = ERROR_MESSAGE() + ' Line ' + CAST(ERROR_LINE() AS NVARCHAR(5))
+      , @ErrorSeverity = ERROR_SEVERITY()
+      , @ErrorState = ERROR_STATE();
+
+    IF @@trancount > 0
+    BEGIN
+        ROLLBACK TRANSACTION;
+    END;
+
+    RAISERROR(@ErrorMessage, @ErrorSeverity, @ErrorState);
+END CATCH;`;
+exports.wrapTransactionMs = wrapTransactionMs;
+//# sourceMappingURL=wrap-transaction-ms.js.map

package/dist/cjs/src/ms/wrap-transaction-ms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrap-transaction-ms.js","sourceRoot":"","sources":["../../../../src/ms/wrap-transaction-ms.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACI,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAAU,EAAE,CAAC;;;MAGvD,MAAM;;;;;;;;;;;;;;;;;;;;WAoBD,CAAC;AAvBC,QAAA,iBAAiB,qBAuBlB"}

package/dist/cjs/src/pg/gen-table-interfaces-pg.js

@@ -0,0 +1,83 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genTableInterfacesPg = exports.genTableInterfacePg = void 0;
+/* eslint-disable no-await-in-loop */
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+const af_echo_ts_1 = require("af-echo-ts");
+const table_schema_pg_1 = require("./table-schema-pg");
+const pool_pg_1 = require("./pool-pg");
+const utils_pg_1 = require("./utils-pg");
+// export const getJsTypeByUdtNamePg = (udtName?: TArrayTypesPg): string => { // VVR
+//   switch (udtName) {
+//     case '_int2':
+//     case '_int4':
+//     case '_int8':
+//     case '_float8':
+//     case '_float4':
+//     case '_numeric':
+//     case '_money':
+//       return 'number';
+//     case '_text':
+//     case '_varchar':
+//       return 'string';
+//     case '_bool':
+//       return 'boolean';
+//     case '_time':
+//     case '_date':
+//     case '_timestamp':
+//     case '_timestamptz':
+//       return '(string | Date | number)';
+//     default:
+//       return 'any';
+//   }
+// };
+const getFieldDefinition = (d) => `${d.name}${d.isNullable || d.hasDefault ? '?' : ''}: ${(0, utils_pg_1.getJsTypeByTypePg)(d.dataType)}${d.isNullable ? ' | null' : ''}`;
+const TABLE_INTERFACES_DIR = __dirname.replace(/\\/g, '/').replace(/\/dist\//, '/');
+const genTableInterfacePg = async (connectionId, commonSchemaAndTable, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
+    const tableSchema = await (0, table_schema_pg_1.getTableSchemaPg)(connectionId, commonSchemaAndTable);
+    const interfaceName = `I${commonSchemaAndTable
+        .replace('.', '_')
+        .split('_')
+        .map((word) => word[0].toUpperCase() + word.substring(1)).join('')}Record`;
+    const linesArr = Object.values(tableSchema.columnsSchema).map(getFieldDefinition);
+    const content = `export interface ${interfaceName} {\n${linesArr.map((v) => `  ${v}`).join(',\n')},\n}\n`;
+    const fileName = `${commonSchemaAndTable.replace('.', '-').toLowerCase()}.ts`;
+    const filePath = path.resolve(path.join(tableInterfacesDir, fileName));
+    fs.writeFileSync(filePath, content);
+};
+exports.genTableInterfacePg = genTableInterfacePg;
+const genTableInterfacesPg = async (connectionId, tables, tableInterfacesDir = TABLE_INTERFACES_DIR) => {
+    for (let i = 0; i < tables.length; i++) {
+        const commonSchemaAndTable = tables[i];
+        await (0, exports.genTableInterfacePg)(connectionId, commonSchemaAndTable, tableInterfacesDir);
+    }
+    af_echo_ts_1.echo.g(`Generated ${tables.length} table interfaces in folder '.${tableInterfacesDir.replace(process.cwd().replace(/\\/g, '/'), '')}/'`);
+    await (0, pool_pg_1.closeAllPgConnectionsPg)();
+    process.exit(0);
+};
+exports.genTableInterfacesPg = genTableInterfacesPg;
+//# sourceMappingURL=gen-table-interfaces-pg.js.map

package/dist/cjs/src/pg/gen-table-interfaces-pg.js.map

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

package/dist/cjs/src/pg/get-sql/insert.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInsertSqlPg = void 0;
+const table_schema_pg_1 = require("../table-schema-pg");
+const prepare_value_1 = require("../prepare-value");
+const utils_1 = require("../../utils/utils");
+const common_1 = require("../../common");
+const getInsertSqlPg = async (arg) => {
+    const { commonSchemaAndTable } = arg;
+    const tableSchema = await (0, table_schema_pg_1.getTableSchemaPg)(arg.connectionId, commonSchemaAndTable);
+    const { columnsSchema, fieldsWoSerialsAndRO, defaults } = tableSchema;
+    const insertFieldsArray = fieldsWoSerialsAndRO.filter((f) => (!(arg.excludeFromInsert || []).includes(f)));
+    const insertFieldsList = insertFieldsArray.map((f) => `"${f}"`).join(', ');
+    const preparedRowsArray = arg.recordset.map((record) => {
+        const preparedRecordValuesArray = insertFieldsArray.map((f) => {
+            const value = record[f];
+            const fieldDef = columnsSchema[f];
+            if (value != null) {
+                return (0, prepare_value_1.prepareSqlValuePg)({ value, fieldDef });
+            }
+            const defVal = defaults[f];
+            if (!fieldDef.isNullable && defVal != null) {
+                return defVal;
+            }
+            return common_1.NULL;
+        });
+        return preparedRecordValuesArray.join(',');
+    });
+    const values = preparedRowsArray.map((v) => `(${v})`).join('\n,');
+    const out = arg.addOutputInserted ? ' RETURNING * ' : '';
+    const target = utils_1.schemaTable.to.pg(commonSchemaAndTable);
+    // noinspection UnnecessaryLocalVariableJS
+    const insertSQL = `INSERT INTO ${target} (${insertFieldsList})
+                     VALUES ${values} ON CONFLICT DO NOTHING ${out};`;
+    return insertSQL;
+};
+exports.getInsertSqlPg = getInsertSqlPg;
+//# sourceMappingURL=insert.js.map

package/dist/cjs/src/pg/get-sql/insert.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"insert.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/insert.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,oDAAqD;AAGrD,6CAAgD;AAChD,yCAAoC;AAE7B,MAAM,cAAc,GAAG,KAAK,EAAoC,GAMtE,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IAErC,MAAM,WAAW,GAAmB,MAAM,IAAA,kCAAgB,EAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IACnG,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;IAEtE,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3G,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE3E,MAAM,iBAAiB,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACrD,MAAM,yBAAyB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,OAAO,IAAA,iCAAiB,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3C,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,aAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,OAAO,yBAAyB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,MAAM,MAAM,GAAG,mBAAW,CAAC,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;IACvD,0CAA0C;IAC1C,MAAM,SAAS,GAAG,eAAe,MAAM,KAAK,gBAAgB;8BAChC,MAAM,2BAA2B,GAAG,GAAG,CAAC;IACpE,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAtCW,QAAA,cAAc,kBAsCzB"}

package/dist/cjs/src/pg/get-sql/merge.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMergeSqlPg = void 0;
+const table_schema_pg_1 = require("../table-schema-pg");
+const prepare_value_1 = require("../prepare-value");
+const utils_1 = require("../../utils/utils");
+const getMergeSqlPg = async (arg) => {
+    const { connectionId, commonSchemaAndTable, recordset, omitFields = [], noUpdateIfNull } = arg;
+    if (!recordset?.length) {
+        return '';
+    }
+    const schemaTableStr = utils_1.schemaTable.to.pg(commonSchemaAndTable);
+    const tableSchema = await (0, table_schema_pg_1.getTableSchemaPg)(connectionId, commonSchemaAndTable);
+    const { columnsSchema, pk, fieldsWoSerialsAndRO, defaults } = tableSchema;
+    let mergeFieldsArr = fieldsWoSerialsAndRO;
+    if (omitFields.length) {
+        const set = new Set(omitFields);
+        mergeFieldsArr = fieldsWoSerialsAndRO.filter((fieldName) => !set.has(fieldName));
+    }
+    const mergeValues = recordset.map((record) => {
+        const preparedValues = [];
+        mergeFieldsArr.forEach((f) => {
+            const value = record[f];
+            let sqlValue = (0, prepare_value_1.prepareSqlValuePg)({ value, fieldDef: columnsSchema[f] });
+            if (defaults[f] != null && (sqlValue == null || sqlValue === 'null')) {
+                sqlValue = defaults[f];
+            }
+            preparedValues.push(sqlValue);
+        });
+        return `(${preparedValues.join(', ')})`;
+    }).join(',\n  ').trim();
+    const updateSetStr = mergeFieldsArr.map((f) => {
+        const vArr = [`EXCLUDED."${f}"`];
+        if (noUpdateIfNull) {
+            vArr.push(`${schemaTableStr}."${f}"`);
+        }
+        if (defaults[f]) {
+            vArr.push(defaults[f]);
+        }
+        return `"${f}" = ${vArr.length > 1 ? `COALESCE(${vArr.join(', ')})` : vArr[0]}`;
+    }).join(',\n  ');
+    const mergeFieldsList = mergeFieldsArr.map((f) => `"${f}"`).join(',\n  ');
+    // noinspection UnnecessaryLocalVariableJS
+    let mergeSQL = `--
+INSERT INTO ${schemaTableStr} (
+  ${mergeFieldsList}
+)
+VALUES
+  ${mergeValues}
+ON CONFLICT (${pk.map((f) => `"${f}"`).join(', ')})
+DO UPDATE SET
+  ${updateSetStr}
+;`;
+    if (typeof arg.mergeCorrection === 'function') {
+        mergeSQL = arg.mergeCorrection(mergeSQL);
+    }
+    return mergeSQL;
+};
+exports.getMergeSqlPg = getMergeSqlPg;
+//# sourceMappingURL=merge.js.map

package/dist/cjs/src/pg/get-sql/merge.js.map

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

package/dist/cjs/src/pg/get-sql/update.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUpdateSqlPg = void 0;
+const table_schema_pg_1 = require("../table-schema-pg");
+const prepare_value_1 = require("../prepare-value");
+const utils_1 = require("../../utils/utils");
+const getUpdateSqlPg = async (arg) => {
+    const { connectionId, commonSchemaAndTable, record, customSets = {}, } = arg;
+    const tableSchema = await (0, table_schema_pg_1.getTableSchemaPg)(connectionId, commonSchemaAndTable);
+    const { columnsSchema, pk, fieldsWoSerialsAndRO } = tableSchema;
+    const { updateIdentity = pk } = arg;
+    const updateFields = fieldsWoSerialsAndRO.filter((f) => (!updateIdentity.includes(f)));
+    const getPreparedSqlValue = (f) => (0, prepare_value_1.prepareSqlValuePg)({ value: record[f], fieldDef: columnsSchema[f] });
+    const preparedRecord = {};
+    updateFields.forEach((f) => {
+        if (customSets[f] !== undefined) {
+            preparedRecord[f] = customSets[f];
+        }
+        else if (record[f] !== undefined) {
+            preparedRecord[f] = getPreparedSqlValue(f);
+        }
+    });
+    const sets = Object.entries(preparedRecord).map(([f, v]) => `"${f}" = ${v}`).join(', ');
+    const where = updateIdentity.map((f) => `"${f}" = ${getPreparedSqlValue(f)}`).join(' AND ');
+    // noinspection UnnecessaryLocalVariableJS
+    const updateSql = `${'UPDATE'} ${utils_1.schemaTable.to.pg(commonSchemaAndTable)} SET
+    ${sets}
+  WHERE ${where};`;
+    return updateSql;
+};
+exports.getUpdateSqlPg = getUpdateSqlPg;
+//# sourceMappingURL=update.js.map

package/dist/cjs/src/pg/get-sql/update.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/update.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,oDAAqD;AAGrD,6CAAgD;AAEzC,MAAM,cAAc,GAAG,KAAK,EAAmC,GAMrE,EAAmB,EAAE;IACpB,MAAM,EACJ,YAAY,EACZ,oBAAoB,EACpB,MAAM,EACN,UAAU,GAAG,EAAE,GAChB,GAAG,GAAG,CAAC;IACR,MAAM,WAAW,GAAmB,MAAM,IAAA,kCAAgB,EAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAC/F,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,oBAAoB,EAAE,GAAG,WAAW,CAAC;IAEhE,MAAM,EAAE,cAAc,GAAG,EAAE,EAAE,GAAG,GAAG,CAAC;IAEpC,MAAM,YAAY,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvF,MAAM,mBAAmB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,IAAA,iCAAiB,EAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE/G,MAAM,cAAc,GAAc,EAAE,CAAC;IACrC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACzB,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YAChC,cAAc,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACnC,cAAc,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAExF,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE5F,0CAA0C;IAC1C,MAAM,SAAS,GAAG,GAAG,QAAQ,IAAI,mBAAW,CAAC,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC;MACpE,IAAI;UACA,KAAK,GAAG,CAAC;IACjB,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAvCW,QAAA,cAAc,kBAuCzB"}

package/dist/cjs/src/pg/{insert.js → insert-pg.js}

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertPg = exports.EUpdateLevel = void 0;
+// noinspection SqlResolve
 const af_tools_ts_1 = require("af-tools-ts");
-const table_schema_1 = require("./table-schema");
+const table_schema_pg_1 = require("./table-schema-pg");
 const query_pg_1 = require("./query-pg");
 const logger_error_1 = require("../logger-error");
 var EUpdateLevel;
@@ -11,9 +12,8 @@ var EUpdateLevel;
     EUpdateLevel[EUpdateLevel["UPDATE_IF_NOT_FOUND"] = 1] = "UPDATE_IF_NOT_FOUND";
     EUpdateLevel[EUpdateLevel["UPDATE_ALWAYS"] = 2] = "UPDATE_ALWAYS";
 })(EUpdateLevel || (exports.EUpdateLevel = EUpdateLevel = {}));
-const hasAllValues = (fieldList, record) => (fieldList === null || fieldList === void 0 ? void 0 : fieldList.length) && fieldList.every((f) => record[f] !== undefined);
+const hasAllValues = (fieldList, record) => fieldList?.length && fieldList.every((f) => record[f] !== undefined);
 const selectByAnyIdentity = async (connectionId, identities, record, source) => {
-    var _a, _b;
     const identityAlternativesArr = [];
     let pos = 0;
     const positionValues = [];
@@ -29,18 +29,18 @@ const selectByAnyIdentity = async (connectionId, identities, record, source) =>
                  FROM ${source}
                  WHERE ${identityWhere}`;
         const result = await (0, query_pg_1.queryPg)(connectionId, selectSql, positionValues);
-        if ((_a = result === null || result === void 0 ? void 0 : result.rows) === null || _a === void 0 ? void 0 : _a[0]) {
-            return (_b = result === null || result === void 0 ? void 0 : result.rows) === null || _b === void 0 ? void 0 : _b[0];
+        if (result?.rows?.[0]) {
+            return result?.rows?.[0];
         }
     }
 };
 const insertPg = async ({ connectionId, record, target, source, isThrow, updateLevel, }) => {
-    const { recordSchema, pk = [], serials = [], uc = [] } = await (0, table_schema_1.getTableSchemaPg)(connectionId, target);
+    const { columnsSchema, pk = [], serialsFields = [], uc = [] } = await (0, table_schema_pg_1.getTableSchemaPg)(connectionId, target);
     // Cleaning the record: deleting properties not included in the set of fields, with the value undefined and auto-incrementing fields
-    const recordWoSerials = (0, af_tools_ts_1.omitBy)(record, (fieldValue, fieldName) => !recordSchema[fieldName] || fieldValue === undefined || serials.includes(fieldName));
+    const recordWoSerials = (0, af_tools_ts_1.omitBy)(record, (fieldValue, fieldName) => !columnsSchema[fieldName] || fieldValue === undefined || serialsFields.includes(fieldName));
     // We form all possible sets of fields, which we then use to search for an added (or already existing) record
     // Normalize (sort) sets
-    let identities = [pk, ...serials.map((f) => [f]), ...Object.values(uc)].filter((a) => a.length).map((a) => a.sort());
+    let identities = [pk, ...serialsFields.map((f) => [f]), ...Object.values(uc)].filter((a) => a.length).map((a) => a.sort());
     // Removing duplicates
     identities = [...(new Set(identities.map((a) => a.join('|'))))].map((s) => s.split('|'));
     source = source || target;
@@ -59,7 +59,7 @@ const insertPg = async ({ connectionId, record, target, source, isThrow, updateL
             }
         }
         // There is no suitable record in the database, we insert it
-        const { values, positionsList, fieldsList, upsertFields } = (0, table_schema_1.getFieldsAndValuesPg)(recordWoSerials, recordSchema);
+        const { values, positionsList, fieldsList, upsertFields } = (0, table_schema_pg_1.getFieldsAndValuesPg)(recordWoSerials, columnsSchema);
         const insertSQL = `INSERT INTO ${target} (${fieldsList})
                        VALUES (${positionsList}) ON CONFLICT ${updateLevel === EUpdateLevel.NEVER_UPDATE
             ? 'DO NOTHING'
@@ -90,4 +90,4 @@ const insertPg = async ({ connectionId, record, target, source, isThrow, updateL
     }
 };
 exports.insertPg = insertPg;
-//# sourceMappingURL=insert.js.map
+//# sourceMappingURL=insert-pg.js.map

package/dist/cjs/src/pg/insert-pg.js.map

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

package/dist/cjs/src/pg/is-table-or-view-exists.js

@@ -5,13 +5,12 @@ exports.isTableOrViewExistsPg = void 0;
 const query_pg_1 = require("./query-pg");
 const tableOrViewExistenceCache = new Set();
 const isTableOrViewExistsPg = async (connectionId, schemaOrFullName, tableOrViewNAme) => {
-    var _a, _b;
     const entityName = tableOrViewNAme ? `${schemaOrFullName}.${tableOrViewNAme}` : schemaOrFullName;
     if (tableOrViewExistenceCache.has(entityName)) {
         return true;
     }
     const result = await (0, query_pg_1.queryPg)(connectionId, `SELECT to_regclass('${entityName}') as is_exists`);
-    if ((_b = (_a = result === null || result === void 0 ? void 0 : result.rows) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.is_exists) {
+    if (result?.rows?.[0]?.is_exists) {
         tableOrViewExistenceCache.add(entityName);
         return true;
     }

package/dist/cjs/src/pg/is-table-or-view-exists.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-table-or-view-exists.js","sourceRoot":"","sources":["../../../../src/pg/is-table-or-view-exists.ts"],"names":[],"mappings":";;;AAAA,0BAA0B;AAC1B,yCAAqC;AAErC,MAAM,yBAAyB,GAAG,IAAI,GAAG,EAAE,CAAC;AAErC,MAAM,qBAAqB,GAAG,KAAK,EACxC,YAAoB,EACpB,gBAAwB,EACxB,eAAwB,EACN,EAAE;;IACpB,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,gBAAgB,IAAI,eAAe,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACjG,IAAI,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;QAC7C,OAAO,IAAI,CAAC;KACb;IACD,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAO,EAAC,YAAY,EAAE,uBAAuB,UAAU,iBAAiB,CAAC,CAAC;IAC/F,IAAI,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAG,CAAC,CAAC,0CAAE,SAAS,EAAE;QAChC,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}
+{"version":3,"file":"is-table-or-view-exists.js","sourceRoot":"","sources":["../../../../src/pg/is-table-or-view-exists.ts"],"names":[],"mappings":";;;AAAA,0BAA0B;AAC1B,yCAAqC;AAErC,MAAM,yBAAyB,GAAG,IAAI,GAAG,EAAE,CAAC;AAErC,MAAM,qBAAqB,GAAG,KAAK,EACxC,YAAoB,EACpB,gBAAwB,EACxB,eAAwB,EACN,EAAE;IACpB,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,gBAAgB,IAAI,eAAe,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACjG,IAAI,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAO,EAAC,YAAY,EAAE,uBAAuB,UAAU,iBAAiB,CAAC,CAAC;IAC/F,IAAI,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;QACjC,yBAAyB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}

package/dist/cjs/src/pg/{pg-pool.js → pool-pg.js}

@@ -2,7 +2,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.closeAllPgConnectionsPg = exports.closePoolPg = exports.getPoolPg = exports.poolsCachePg = exports.getDbConfigPg = void 0;
 const config_1 = __importDefault(require("config"));
@@ -18,7 +17,7 @@ if (cfg.database) {
     dbs = { ...cfg.database };
     dbOptions = {};
 }
-else if ((_b = (_a = cfg.db) === null || _a === void 0 ? void 0 : _a.postgres) === null || _b === void 0 ? void 0 : _b.dbs) {
+else if (cfg.db?.postgres?.dbs) {
     dbs = { ...cfg.db.postgres.dbs };
     dbOptions = { ...(cfg.db.postgres.options || {}) };
 }
@@ -27,15 +26,15 @@ const defaultOptions = {
     // in addition here are the pool specific configuration parameters:
     // number of milliseconds to wait before timing out when connecting a new client
     // by default this is 0 which means no timeout
-    connectionTimeoutMillis: 5 * 60000,
+    connectionTimeoutMillis: 5 * 60000, // 5 min
     // number of milliseconds a client must sit idle in the pool and not be checked out
     // before it is disconnected from the backend and discarded
     // default is 10000 (10 seconds) - set to 0 to disable auto-disconnection of idle clients
-    idleTimeoutMillis: common_1._3_HOURS,
+    idleTimeoutMillis: common_1._3_HOURS, // 3 h
     // maximum number of clients the pool should contain
     // by default this is set to 10.
     max: 10,
-    statement_timeout: common_1._3_HOURS,
+    statement_timeout: common_1._3_HOURS, // number of milliseconds before a statement in query will time out, default is no timeout
     query_timeout: common_1._3_HOURS, // number of milliseconds until the request call times out, no timeout by default
 };
 dbOptions = config_1.default.util.extendDeep(defaultOptions, dbOptions);
@@ -82,7 +81,7 @@ const closePoolPg = async (connectionId) => {
         return true;
     }
     const fns = (pool._clients || [])
-        .filter((client) => (client === null || client === void 0 ? void 0 : client._connected) && typeof (client === null || client === void 0 ? void 0 : client.end) === 'function')
+        .filter((client) => client?._connected && typeof client?.end === 'function')
         .map((client) => client.end());
     await Promise.all(fns);
     return true;
@@ -90,4 +89,4 @@ const closePoolPg = async (connectionId) => {
 exports.closePoolPg = closePoolPg;
 const closeAllPgConnectionsPg = async () => Promise.all(Object.keys(exports.poolsCachePg).map((connectionId) => (0, exports.closePoolPg)(connectionId)));
 exports.closeAllPgConnectionsPg = closeAllPgConnectionsPg;
-//# sourceMappingURL=pg-pool.js.map
+//# sourceMappingURL=pool-pg.js.map

package/dist/cjs/src/pg/pool-pg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,2BAAkD;AAClD,2CAAkC;AAClC,6CAAwC;AACxC,kDAAyC;AAGzC,sCAAqC;AAErC,MAAM,GAAG,GAAG,IAAA,uBAAS,EAAC,gBAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAM,CAAC,CAAQ,CAAC;AAE3D,IAAI,GAAG,GAAW,EAAE,CAAC;AACrB,IAAI,SAAS,GAAQ,EAAE,CAAC;AACxB,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;IACjB,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAY,CAAC;IACpC,SAAS,GAAG,EAAE,CAAC;AACjB,CAAC;KAAM,IAAI,GAAG,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;IACjC,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IACjC,SAAS,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;AACrD,CAAC;AAED,MAAM,cAAc,GAAiB;IACnC,sDAAsD;IACtD,mEAAmE;IACnE,gFAAgF;IAChF,8CAA8C;IAC9C,uBAAuB,EAAE,CAAC,GAAG,KAAM,EAAE,QAAQ;IAC7C,mFAAmF;IACnF,2DAA2D;IAC3D,yFAAyF;IACzF,iBAAiB,EAAE,iBAAQ,EAAE,MAAM;IACnC,oDAAoD;IACpD,gCAAgC;IAChC,GAAG,EAAE,EAAE;IACP,iBAAiB,EAAE,iBAAQ,EAAE,0FAA0F;IACvH,aAAa,EAAE,iBAAQ,EAAE,iFAAiF;CAC3G,CAAC;AAEF,SAAS,GAAG,gBAAM,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAEvD,MAAM,aAAa,GAAG,CAAK,YAAoB,EAAE,cAAwB,EAAE,UAAoB,EAAiB,EAAE;IACvH,MAAM,aAAa,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC;IACxC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,oCAAoC,YAAY,GAAG,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,cAAc,CAAC,CAAC,CAAC,gBAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;AAC3F,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAEW,QAAA,YAAY,GAAuB,EAAE,CAAC;AAE5C,MAAM,SAAS,GAAG,KAAK,EAAE,YAAoB,EAAoB,EAAE;IACxE,IAAI,CAAC,oBAAY,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAa,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,IAAI,SAAI,CAAC,UAAU,CAAY,CAAC;QAC7C,oBAAY,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,MAAkB,EAAE,EAAE;YAClD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrB,qBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,MAAkB,EAAE,EAAE;YACxC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAkC,CAAC;YACnE,iBAAI,CAAC,KAAK,CAAC,cAAc,YAAY,qBAAqB,QAAQ,kBAAkB,SAAS,EAAE,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAkB,EAAE,EAAE;YACvC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAkC,CAAC;YACnE,iBAAI,CAAC,KAAK,CAAC,cAAc,YAAY,mBAAmB,QAAQ,kBAAkB,SAAS,EAAE,CAAC,CAAC;QACjG,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IACD,OAAO,oBAAY,CAAC,YAAY,CAAC,CAAC;AACpC,CAAC,CAAC;AApBW,QAAA,SAAS,aAoBpB;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,YAAoB,EAAoB,EAAE;IAC1E,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,oBAAY,CAAC,YAAY,CAAC,CAAC;IACxC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;SAC9B,MAAM,CAAC,CAAC,MAAqB,EAAE,EAAE,CAAC,MAAM,EAAE,UAAU,IAAI,OAAO,MAAM,EAAE,GAAG,KAAK,UAAU,CAAC;SAC1F,GAAG,CAAC,CAAC,MAAqB,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB;AAEK,MAAM,uBAAuB,GAAG,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAY,CAAC,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAA,mBAAW,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAA9H,QAAA,uBAAuB,2BAAuG"}