af-db-ts 2.0.97 → 2.0.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/src/index.js +4 -2
- package/dist/cjs/src/index.js.map +1 -1
- package/dist/cjs/src/pg/get-sql/merge.js +2 -1
- package/dist/cjs/src/pg/get-sql/merge.js.map +1 -1
- package/dist/cjs/src/pg/get-sql/reset-sequence.js +16 -0
- package/dist/cjs/src/pg/get-sql/reset-sequence.js.map +1 -0
- package/dist/esm/src/index.js +1 -0
- package/dist/esm/src/index.js.map +1 -1
- package/dist/esm/src/pg/get-sql/merge.js +2 -1
- package/dist/esm/src/pg/get-sql/merge.js.map +1 -1
- package/dist/esm/src/pg/get-sql/reset-sequence.js +12 -0
- package/dist/esm/src/pg/get-sql/reset-sequence.js.map +1 -0
- package/dist/types/src/index.d.ts +1 -0
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/pg/get-sql/merge.d.ts +1 -0
- package/dist/types/src/pg/get-sql/merge.d.ts.map +1 -1
- package/dist/types/src/pg/get-sql/reset-sequence.d.ts +5 -0
- package/dist/types/src/pg/get-sql/reset-sequence.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/index.ts +2 -0
- package/src/pg/get-sql/merge.ts +11 -1
- package/src/pg/get-sql/reset-sequence.ts +17 -0
package/dist/cjs/src/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.getTableSchemaPg = exports.getFieldsAndValuesPg = exports.queryPg = exports.quoteStringPg = exports.prepareJsonPg = exports.prepareSqlValuePg = exports.prepareSqlStringPg = exports.closeAllPgConnectionsPg = exports.getDbConfigPg = exports.closePoolPg = exports.getPoolPg = exports.poolsCachePg = void 0;
|
|
3
|
+
exports.getResetSequenceSqlPg = exports.EUpdateLevel = exports.insertPg = exports.getUpdateSqlPg = exports.getMergeSqlPg = exports.getInsertSqlPg = exports.getNormalizedTypePg = exports.getTypeByUdtNamePg = exports.getJsTypeByTypePg = exports.genTableInterfacesPg = exports.genTableInterfacePg = exports.wrapTransactionMs = exports.correctRecordSchemaMs = exports.getTableSchemaMs = exports.queryMs = exports.escapeStringMs = exports.prepareSqlStringMs = exports.prepareSqlValueMs = exports.getPoolMs = exports.getDbConfigMs = exports.closeDbConnectionsMs = exports.closeDbConnectionsAndExitMs = exports.closeAllDbConnectionsMs = exports.getPoolConnectionMs = exports.poolsCacheMs = exports.getUpdateSqlMs = exports.getMergeSqlMs = exports.getInsertSqlMs = exports.getJsTypeByTypeMs = exports.genTableInterfacesMs = exports.genTableInterfaceMs = exports.prepareBigIntNumber = exports.prepareFloatNumber = exports.parseFloatNumber = exports.prepareIntNumber = exports.parseIntNumber = exports.getDatetimeWithPrecisionAndOffset = exports.dateTimeValue = exports.getTypeOfDateInput = exports.getLuxonDT = exports.q = exports.removePairBrackets = exports.binToHexString = exports.prepareUUID = exports.prepareJSON = exports.schemaTable = exports.setLogger = exports.logSqlError = exports.graceExit = exports.closeAllDb = void 0;
|
|
4
|
+
exports.getTableSchemaPg = exports.getFieldsAndValuesPg = exports.queryPg = exports.quoteStringPg = exports.prepareJsonPg = exports.prepareSqlValuePg = exports.prepareSqlStringPg = exports.closeAllPgConnectionsPg = exports.getDbConfigPg = exports.closePoolPg = exports.getPoolPg = exports.poolsCachePg = exports.isTableOrViewExistsPg = void 0;
|
|
5
5
|
var common_1 = require("./common");
|
|
6
6
|
Object.defineProperty(exports, "closeAllDb", { enumerable: true, get: function () { return common_1.closeAllDb; } });
|
|
7
7
|
Object.defineProperty(exports, "graceExit", { enumerable: true, get: function () { return common_1.graceExit; } });
|
|
@@ -72,6 +72,8 @@ Object.defineProperty(exports, "getUpdateSqlPg", { enumerable: true, get: functi
|
|
|
72
72
|
var insert_pg_1 = require("./pg/insert-pg");
|
|
73
73
|
Object.defineProperty(exports, "insertPg", { enumerable: true, get: function () { return insert_pg_1.insertPg; } });
|
|
74
74
|
Object.defineProperty(exports, "EUpdateLevel", { enumerable: true, get: function () { return insert_pg_1.EUpdateLevel; } });
|
|
75
|
+
var reset_sequence_1 = require("./pg/get-sql/reset-sequence");
|
|
76
|
+
Object.defineProperty(exports, "getResetSequenceSqlPg", { enumerable: true, get: function () { return reset_sequence_1.getResetSequenceSqlPg; } });
|
|
75
77
|
var is_table_or_view_exists_1 = require("./pg/is-table-or-view-exists");
|
|
76
78
|
Object.defineProperty(exports, "isTableOrViewExistsPg", { enumerable: true, get: function () { return is_table_or_view_exists_1.isTableOrViewExistsPg; } });
|
|
77
79
|
var pool_pg_1 = require("./pg/pool-pg");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;;AAsBA,mCAIkB;AAHhB,oGAAA,UAAU,OAAA;AACV,mGAAA,SAAS,OAAA;AACT,qGAAA,WAAW,OAAA;AAGb,+CAA2C;AAAlC,yGAAA,SAAS,OAAA;AAElB,uCAOuB;AANrB,oGAAA,WAAW,OAAA;AACX,oGAAA,WAAW,OAAA;AACX,oGAAA,WAAW,OAAA;AACX,uGAAA,cAAc,OAAA;AACd,2GAAA,kBAAkB,OAAA;AAClB,0FAAA,CAAC,OAAA;AAGH,6CAK0B;AAJxB,sGAAA,UAAU,OAAA;AACV,8GAAA,kBAAkB,OAAA;AAClB,yGAAA,aAAa,OAAA;AACb,6HAAA,iCAAiC,OAAA;AAGnC,+CAQ2B;AAPzB,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAEhB,6GAAA,gBAAgB,OAAA;AAChB,+GAAA,kBAAkB,OAAA;AAElB,gHAAA,mBAAmB,OAAA;AAgBrB,wEAGsC;AAFpC,8HAAA,mBAAmB,OAAA;AACnB,+HAAA,oBAAoB,OAAA;AAGtB,0CAAkD;AAAzC,6GAAA,iBAAiB,OAAA;AAE1B,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,4CAAmD;AAA1C,sGAAA,aAAa,OAAA;AAEtB,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,wCAQsB;AAPpB,uGAAA,YAAY,OAAA;AACZ,8GAAA,mBAAmB,OAAA;AACnB,kHAAA,uBAAuB,OAAA;AACvB,sHAAA,2BAA2B,OAAA;AAC3B,+GAAA,oBAAoB,OAAA;AACpB,wGAAA,aAAa,OAAA;AACb,oGAAA,SAAS,OAAA;AAGX,oDAI4B;AAH1B,kHAAA,iBAAiB,OAAA;AACjB,mHAAA,kBAAkB,OAAA;AAClB,+GAAA,cAAc,OAAA;AAGhB,0CAAwC;AAA/B,mGAAA,OAAO,OAAA;AAEhB,wDAG8B;AAF5B,mHAAA,gBAAgB,OAAA;AAChB,wHAAA,qBAAqB,OAAA;AAGvB,gEAA6D;AAApD,wHAAA,iBAAiB,OAAA;AAgB1B,wEAGsC;AAFpC,8HAAA,mBAAmB,OAAA;AACnB,+HAAA,oBAAoB,OAAA;AAGtB,0CAIuB;AAHrB,6GAAA,iBAAiB,OAAA;AACjB,8GAAA,kBAAkB,OAAA;AAClB,+GAAA,mBAAmB,OAAA;AAGrB,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,4CAAmD;AAA1C,sGAAA,aAAa,OAAA;AAEtB,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,4CAAwD;AAA/C,qGAAA,QAAQ,OAAA;AAAE,yGAAA,YAAY,OAAA;AAE/B,wEAAqE;AAA5D,gIAAA,qBAAqB,OAAA;AAE9B,wCAMsB;AALpB,uGAAA,YAAY,OAAA;AACZ,oGAAA,SAAS,OAAA;AACT,sGAAA,WAAW,OAAA;AACX,wGAAA,aAAa,OAAA;AACb,kHAAA,uBAAuB,OAAA;AAGzB,oDAK4B;AAJ1B,mHAAA,kBAAkB,OAAA;AAClB,kHAAA,iBAAiB,OAAA;AACjB,8GAAA,aAAa,OAAA;AACb,8GAAA,aAAa,OAAA;AAGf,0CAAwC;AAA/B,mGAAA,OAAO,OAAA;AAEhB,wDAG8B;AAF5B,uHAAA,oBAAoB,OAAA;AACpB,mHAAA,gBAAgB,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":";;;;AAsBA,mCAIkB;AAHhB,oGAAA,UAAU,OAAA;AACV,mGAAA,SAAS,OAAA;AACT,qGAAA,WAAW,OAAA;AAGb,+CAA2C;AAAlC,yGAAA,SAAS,OAAA;AAElB,uCAOuB;AANrB,oGAAA,WAAW,OAAA;AACX,oGAAA,WAAW,OAAA;AACX,oGAAA,WAAW,OAAA;AACX,uGAAA,cAAc,OAAA;AACd,2GAAA,kBAAkB,OAAA;AAClB,0FAAA,CAAC,OAAA;AAGH,6CAK0B;AAJxB,sGAAA,UAAU,OAAA;AACV,8GAAA,kBAAkB,OAAA;AAClB,yGAAA,aAAa,OAAA;AACb,6HAAA,iCAAiC,OAAA;AAGnC,+CAQ2B;AAPzB,2GAAA,cAAc,OAAA;AACd,6GAAA,gBAAgB,OAAA;AAEhB,6GAAA,gBAAgB,OAAA;AAChB,+GAAA,kBAAkB,OAAA;AAElB,gHAAA,mBAAmB,OAAA;AAgBrB,wEAGsC;AAFpC,8HAAA,mBAAmB,OAAA;AACnB,+HAAA,oBAAoB,OAAA;AAGtB,0CAAkD;AAAzC,6GAAA,iBAAiB,OAAA;AAE1B,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,4CAAmD;AAA1C,sGAAA,aAAa,OAAA;AAEtB,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,wCAQsB;AAPpB,uGAAA,YAAY,OAAA;AACZ,8GAAA,mBAAmB,OAAA;AACnB,kHAAA,uBAAuB,OAAA;AACvB,sHAAA,2BAA2B,OAAA;AAC3B,+GAAA,oBAAoB,OAAA;AACpB,wGAAA,aAAa,OAAA;AACb,oGAAA,SAAS,OAAA;AAGX,oDAI4B;AAH1B,kHAAA,iBAAiB,OAAA;AACjB,mHAAA,kBAAkB,OAAA;AAClB,+GAAA,cAAc,OAAA;AAGhB,0CAAwC;AAA/B,mGAAA,OAAO,OAAA;AAEhB,wDAG8B;AAF5B,mHAAA,gBAAgB,OAAA;AAChB,wHAAA,qBAAqB,OAAA;AAGvB,gEAA6D;AAApD,wHAAA,iBAAiB,OAAA;AAgB1B,wEAGsC;AAFpC,8HAAA,mBAAmB,OAAA;AACnB,+HAAA,oBAAoB,OAAA;AAGtB,0CAIuB;AAHrB,6GAAA,iBAAiB,OAAA;AACjB,8GAAA,kBAAkB,OAAA;AAClB,+GAAA,mBAAmB,OAAA;AAGrB,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,4CAAmD;AAA1C,sGAAA,aAAa,OAAA;AAEtB,8CAAqD;AAA5C,wGAAA,cAAc,OAAA;AAEvB,4CAAwD;AAA/C,qGAAA,QAAQ,OAAA;AAAE,yGAAA,YAAY,OAAA;AAE/B,8DAAoE;AAA3D,uHAAA,qBAAqB,OAAA;AAE9B,wEAAqE;AAA5D,gIAAA,qBAAqB,OAAA;AAE9B,wCAMsB;AALpB,uGAAA,YAAY,OAAA;AACZ,oGAAA,SAAS,OAAA;AACT,sGAAA,WAAW,OAAA;AACX,wGAAA,aAAa,OAAA;AACb,kHAAA,uBAAuB,OAAA;AAGzB,oDAK4B;AAJ1B,mHAAA,kBAAkB,OAAA;AAClB,kHAAA,iBAAiB,OAAA;AACjB,8GAAA,aAAa,OAAA;AACb,8GAAA,aAAa,OAAA;AAGf,0CAAwC;AAA/B,mGAAA,OAAO,OAAA;AAEhB,wDAG8B;AAF5B,uHAAA,oBAAoB,OAAA;AACpB,mHAAA,gBAAgB,OAAA"}
|
|
@@ -5,7 +5,7 @@ const table_schema_pg_1 = require("../table-schema-pg");
|
|
|
5
5
|
const prepare_value_1 = require("../prepare-value");
|
|
6
6
|
const utils_1 = require("../../utils/utils");
|
|
7
7
|
const getMergeSqlPg = async (arg) => {
|
|
8
|
-
const { connectionId, commonSchemaAndTable, recordset, omitFields = [], noUpdateIfNull, fieldsExcludedFromUpdatePart = [] } = arg;
|
|
8
|
+
const { connectionId, commonSchemaAndTable, recordset, omitFields = [], noUpdateIfNull, fieldsExcludedFromUpdatePart = [], returning, } = arg;
|
|
9
9
|
if (!recordset?.length) {
|
|
10
10
|
return '';
|
|
11
11
|
}
|
|
@@ -55,6 +55,7 @@ VALUES
|
|
|
55
55
|
ON CONFLICT (${pk.map((f) => `"${f}"`).join(', ')})
|
|
56
56
|
DO UPDATE SET
|
|
57
57
|
${updateSetStr}
|
|
58
|
+
${returning ? `RETURNING ${returning}` : ''}
|
|
58
59
|
;`;
|
|
59
60
|
if (typeof arg.mergeCorrection === 'function') {
|
|
60
61
|
mergeSQL = arg.mergeCorrection(mergeSQL);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/merge.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,oDAAqD;AAErD,6CAAgD;AAGzC,MAAM,aAAa,GAAG,KAAK,EAAoC,
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getResetSequenceSqlPg = void 0;
|
|
4
|
+
const table_schema_pg_1 = require("../table-schema-pg");
|
|
5
|
+
const utils_1 = require("../../utils/utils");
|
|
6
|
+
const getResetSequenceSqlPg = async (arg) => {
|
|
7
|
+
const { commonSchemaAndTable } = arg;
|
|
8
|
+
const [schema, table] = utils_1.schemaTable.to.common(commonSchemaAndTable).split('.');
|
|
9
|
+
const { serialsFields } = await (0, table_schema_pg_1.getTableSchemaPg)(arg.connectionId, commonSchemaAndTable);
|
|
10
|
+
return serialsFields.map((incFName) => {
|
|
11
|
+
const sequenceName = `${table}_${incFName}_seq`;
|
|
12
|
+
return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT MAX("${incFName}") FROM "${schema}"."${table}"));`;
|
|
13
|
+
}).join('\n');
|
|
14
|
+
};
|
|
15
|
+
exports.getResetSequenceSqlPg = getResetSequenceSqlPg;
|
|
16
|
+
//# sourceMappingURL=reset-sequence.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reset-sequence.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":";;;AAAA,wDAAsD;AACtD,6CAAgD;AAEzC,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAG3C,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IACrC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,mBAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,kCAAgB,EAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAEzF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,QAAQ,MAAM,CAAC;QAChD,OAAO,mBAAmB,MAAM,MAAM,YAAY,oBAAoB,QAAQ,YAAY,MAAM,MAAM,KAAK,MAAM,CAAC;IACpH,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC;AAbW,QAAA,qBAAqB,yBAahC"}
|
package/dist/esm/src/index.js
CHANGED
|
@@ -19,6 +19,7 @@ export { getInsertSqlPg } from './pg/get-sql/insert';
|
|
|
19
19
|
export { getMergeSqlPg } from './pg/get-sql/merge';
|
|
20
20
|
export { getUpdateSqlPg } from './pg/get-sql/update';
|
|
21
21
|
export { insertPg, EUpdateLevel } from './pg/insert-pg';
|
|
22
|
+
export { getResetSequenceSqlPg } from './pg/get-sql/reset-sequence';
|
|
22
23
|
export { isTableOrViewExistsPg } from './pg/is-table-or-view-exists';
|
|
23
24
|
export { poolsCachePg, getPoolPg, closePoolPg, getDbConfigPg, closeAllPgConnectionsPg, } from './pg/pool-pg';
|
|
24
25
|
export { prepareSqlStringPg, prepareSqlValuePg, prepareJsonPg, quoteStringPg, } from './pg/prepare-value';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,UAAU,EACV,SAAS,EACT,WAAW,GACZ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EACL,WAAW,EACX,WAAW,EACX,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,CAAC,GACF,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,aAAa,EACb,iCAAiC,GAClC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,gBAAgB,EAEhB,gBAAgB,EAChB,kBAAkB,EAElB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAe3B,OAAO,EACL,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,2BAA2B,EAC3B,oBAAoB,EACpB,aAAa,EACb,SAAS,GACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EACL,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAgB7D,OAAO,EACL,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EACL,YAAY,EACZ,SAAS,EACT,WAAW,EACX,aAAa,EACb,uBAAuB,GACxB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EACL,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAsBA,OAAO,EACL,UAAU,EACV,SAAS,EACT,WAAW,GACZ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EACL,WAAW,EACX,WAAW,EACX,WAAW,EACX,cAAc,EACd,kBAAkB,EAClB,CAAC,GACF,MAAM,eAAe,CAAC;AAEvB,OAAO,EACL,UAAU,EACV,kBAAkB,EAClB,aAAa,EACb,iCAAiC,GAClC,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,cAAc,EACd,gBAAgB,EAEhB,gBAAgB,EAChB,kBAAkB,EAElB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAe3B,OAAO,EACL,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,2BAA2B,EAC3B,oBAAoB,EACpB,aAAa,EACb,SAAS,GACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EACL,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAgB7D,OAAO,EACL,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EACL,YAAY,EACZ,SAAS,EACT,WAAW,EACX,aAAa,EACb,uBAAuB,GACxB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EACL,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,sBAAsB,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { getTableSchemaPg } from '../table-schema-pg';
|
|
|
2
2
|
import { prepareSqlValuePg } from '../prepare-value';
|
|
3
3
|
import { schemaTable } from '../../utils/utils';
|
|
4
4
|
export const getMergeSqlPg = async (arg) => {
|
|
5
|
-
const { connectionId, commonSchemaAndTable, recordset, omitFields = [], noUpdateIfNull, fieldsExcludedFromUpdatePart = [] } = arg;
|
|
5
|
+
const { connectionId, commonSchemaAndTable, recordset, omitFields = [], noUpdateIfNull, fieldsExcludedFromUpdatePart = [], returning, } = arg;
|
|
6
6
|
if (!recordset?.length) {
|
|
7
7
|
return '';
|
|
8
8
|
}
|
|
@@ -52,6 +52,7 @@ VALUES
|
|
|
52
52
|
ON CONFLICT (${pk.map((f) => `"${f}"`).join(', ')})
|
|
53
53
|
DO UPDATE SET
|
|
54
54
|
${updateSetStr}
|
|
55
|
+
${returning ? `RETURNING ${returning}` : ''}
|
|
55
56
|
;`;
|
|
56
57
|
if (typeof arg.mergeCorrection === 'function') {
|
|
57
58
|
mergeSQL = arg.mergeCorrection(mergeSQL);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAoC,
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { getTableSchemaPg } from '../table-schema-pg';
|
|
2
|
+
import { schemaTable } from '../../utils/utils';
|
|
3
|
+
export const getResetSequenceSqlPg = async (arg) => {
|
|
4
|
+
const { commonSchemaAndTable } = arg;
|
|
5
|
+
const [schema, table] = schemaTable.to.common(commonSchemaAndTable).split('.');
|
|
6
|
+
const { serialsFields } = await getTableSchemaPg(arg.connectionId, commonSchemaAndTable);
|
|
7
|
+
return serialsFields.map((incFName) => {
|
|
8
|
+
const sequenceName = `${table}_${incFName}_seq`;
|
|
9
|
+
return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT MAX("${incFName}") FROM "${schema}"."${table}"));`;
|
|
10
|
+
}).join('\n');
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=reset-sequence.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reset-sequence.js","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EAAE,GAG3C,EAAmB,EAAE;IACpB,MAAM,EAAE,oBAAoB,EAAE,GAAG,GAAG,CAAC;IACrC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE/E,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;IAEzF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,GAAG,KAAK,IAAI,QAAQ,MAAM,CAAC;QAChD,OAAO,mBAAmB,MAAM,MAAM,YAAY,oBAAoB,QAAQ,YAAY,MAAM,MAAM,KAAK,MAAM,CAAC;IACpH,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -25,6 +25,7 @@ export { getInsertSqlPg } from './pg/get-sql/insert';
|
|
|
25
25
|
export { getMergeSqlPg } from './pg/get-sql/merge';
|
|
26
26
|
export { getUpdateSqlPg } from './pg/get-sql/update';
|
|
27
27
|
export { insertPg, EUpdateLevel } from './pg/insert-pg';
|
|
28
|
+
export { getResetSequenceSqlPg } from './pg/get-sql/reset-sequence';
|
|
28
29
|
export { isTableOrViewExistsPg } from './pg/is-table-or-view-exists';
|
|
29
30
|
export { poolsCachePg, getPoolPg, closePoolPg, getDbConfigPg, closeAllPgConnectionsPg, } from './pg/pool-pg';
|
|
30
31
|
export { prepareSqlStringPg, prepareSqlValuePg, prepareJsonPg, quoteStringPg, } from './pg/prepare-value';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,6 @@ export declare const getMergeSqlPg: <U extends TDBRecord = TDBRecord>(arg: {
|
|
|
7
7
|
fieldsExcludedFromUpdatePart?: string[] | undefined;
|
|
8
8
|
noUpdateIfNull?: boolean | undefined;
|
|
9
9
|
mergeCorrection?: ((_sql: string) => string) | undefined;
|
|
10
|
+
returning?: string | undefined;
|
|
10
11
|
}) => Promise<string>;
|
|
11
12
|
//# sourceMappingURL=merge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../../src/pg/get-sql/merge.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE9D,eAAO,MAAM,aAAa;kBACV,MAAM;0BACE,MAAM;;;;;8BAKH,MAAM,KAAK,MAAM
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../../src/pg/get-sql/merge.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE9D,eAAO,MAAM,aAAa;kBACV,MAAM;0BACE,MAAM;;;;;8BAKH,MAAM,KAAK,MAAM;;MAExC,QAAQ,MAAM,CAuEjB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reset-sequence.d.ts","sourceRoot":"","sources":["../../../../../src/pg/get-sql/reset-sequence.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,QAAe;IAC/C,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,KAAG,QAAQ,MAAM,CAUjB,CAAC"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -138,6 +138,8 @@ export { getUpdateSqlPg } from './pg/get-sql/update';
|
|
|
138
138
|
|
|
139
139
|
export { insertPg, EUpdateLevel } from './pg/insert-pg';
|
|
140
140
|
|
|
141
|
+
export { getResetSequenceSqlPg } from './pg/get-sql/reset-sequence';
|
|
142
|
+
|
|
141
143
|
export { isTableOrViewExistsPg } from './pg/is-table-or-view-exists';
|
|
142
144
|
|
|
143
145
|
export {
|
package/src/pg/get-sql/merge.ts
CHANGED
|
@@ -12,8 +12,17 @@ export const getMergeSqlPg = async <U extends TDBRecord = TDBRecord> (arg: {
|
|
|
12
12
|
fieldsExcludedFromUpdatePart?: string[],
|
|
13
13
|
noUpdateIfNull?: boolean,
|
|
14
14
|
mergeCorrection?: (_sql: string) => string,
|
|
15
|
+
returning?: string, // '*' | ' "anyFieldName1", "anyFieldName2"'
|
|
15
16
|
}): Promise<string> => {
|
|
16
|
-
const {
|
|
17
|
+
const {
|
|
18
|
+
connectionId,
|
|
19
|
+
commonSchemaAndTable,
|
|
20
|
+
recordset,
|
|
21
|
+
omitFields = [],
|
|
22
|
+
noUpdateIfNull,
|
|
23
|
+
fieldsExcludedFromUpdatePart = [],
|
|
24
|
+
returning,
|
|
25
|
+
} = arg;
|
|
17
26
|
if (!recordset?.length) {
|
|
18
27
|
return '';
|
|
19
28
|
}
|
|
@@ -69,6 +78,7 @@ VALUES
|
|
|
69
78
|
ON CONFLICT (${pk.map((f) => `"${f}"`).join(', ')})
|
|
70
79
|
DO UPDATE SET
|
|
71
80
|
${updateSetStr}
|
|
81
|
+
${returning ? `RETURNING ${returning}` : ''}
|
|
72
82
|
;`;
|
|
73
83
|
if (typeof arg.mergeCorrection === 'function') {
|
|
74
84
|
mergeSQL = arg.mergeCorrection(mergeSQL);
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { getTableSchemaPg } from '../table-schema-pg';
|
|
2
|
+
import { schemaTable } from '../../utils/utils';
|
|
3
|
+
|
|
4
|
+
export const getResetSequenceSqlPg = async (arg: {
|
|
5
|
+
connectionId: string,
|
|
6
|
+
commonSchemaAndTable: string,
|
|
7
|
+
}): Promise<string> => {
|
|
8
|
+
const { commonSchemaAndTable } = arg;
|
|
9
|
+
const [schema, table] = schemaTable.to.common(commonSchemaAndTable).split('.');
|
|
10
|
+
|
|
11
|
+
const { serialsFields } = await getTableSchemaPg(arg.connectionId, commonSchemaAndTable);
|
|
12
|
+
|
|
13
|
+
return serialsFields.map((incFName) => {
|
|
14
|
+
const sequenceName = `${table}_${incFName}_seq`;
|
|
15
|
+
return `SELECT setval('"${schema}"."${sequenceName}"', (SELECT MAX("${incFName}") FROM "${schema}"."${table}"));`;
|
|
16
|
+
}).join('\n');
|
|
17
|
+
};
|