af-db-ts 3.0.7 → 3.0.9
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/README.md +3 -3
- package/dist/cjs/src/pg/pool-pg.js +13 -2
- package/dist/cjs/src/pg/pool-pg.js.map +1 -1
- package/dist/cjs/src/pg/query-pg.js +11 -2
- package/dist/cjs/src/pg/query-pg.js.map +1 -1
- package/dist/esm/src/pg/pool-pg.js +13 -2
- package/dist/esm/src/pg/pool-pg.js.map +1 -1
- package/dist/esm/src/pg/query-pg.js +11 -2
- package/dist/esm/src/pg/query-pg.js.map +1 -1
- package/dist/types/src/@types/i-config.d.ts +2 -1
- package/dist/types/src/@types/i-config.d.ts.map +1 -1
- package/dist/types/src/pg/pool-pg.d.ts +8 -2
- package/dist/types/src/pg/pool-pg.d.ts.map +1 -1
- package/dist/types/src/pg/query-pg.d.ts +11 -3
- package/dist/types/src/pg/query-pg.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/@types/i-config.ts +2 -2
- package/src/pg/pool-pg.ts +18 -2
- package/src/pg/query-pg.ts +20 -4
- package/dist/cjs/tsconfig.tsbuildinfo +0 -1
- package/dist/cjs/tsconfig.types.tsbuildinfo +0 -1
- package/dist/esm/tsconfig.esm.tsbuildinfo +0 -1
package/README.md
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
### Not of interest to third party users
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
### Not of interest to third party users
|
|
2
|
+
|
|
3
|
+
|
|
@@ -51,9 +51,20 @@ const getDbConfigPg = (connectionId, includeOptions, throwError) => {
|
|
|
51
51
|
};
|
|
52
52
|
exports.getDbConfigPg = getDbConfigPg;
|
|
53
53
|
exports.poolsCachePg = {};
|
|
54
|
-
const getPoolPg = async (
|
|
54
|
+
const getPoolPg = async (arg, throwError, registerTypesFunctions) => {
|
|
55
|
+
let poolConfig;
|
|
56
|
+
let connectionId = '';
|
|
57
|
+
if (typeof arg === 'string') {
|
|
58
|
+
connectionId = arg;
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
// eslint-disable-next-line prefer-destructuring
|
|
62
|
+
({ connectionId, poolConfig, throwError, registerTypesFunctions } = arg);
|
|
63
|
+
}
|
|
55
64
|
if (!exports.poolsCachePg[connectionId]) {
|
|
56
|
-
|
|
65
|
+
if (!poolConfig) {
|
|
66
|
+
poolConfig = (0, exports.getDbConfigPg)(connectionId, true, throwError);
|
|
67
|
+
}
|
|
57
68
|
const pool = new pg_1.Pool(poolConfig);
|
|
58
69
|
exports.poolsCachePg[connectionId] = pool;
|
|
59
70
|
pool.on('error', (err, client) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAqC;AACrC,oDAA4B;AAC5B,2BAAkD;AAClD,6CAAwC;AACxC,kDAAyC;AAGzC,sCAAqC;AACrC,oCAAkC;AAElC,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,
|
|
1
|
+
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.queryPg = void 0;
|
|
4
4
|
const pool_pg_1 = require("./pool-pg");
|
|
5
5
|
const common_1 = require("../common");
|
|
6
|
-
const queryPg = async (
|
|
6
|
+
const queryPg = async (arg, sqlText, sqlValues, throwError, prefix, registerTypesFunctions) => {
|
|
7
|
+
let poolConfig;
|
|
8
|
+
let connectionId = '';
|
|
9
|
+
if (typeof arg === 'string') {
|
|
10
|
+
connectionId = arg;
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
// eslint-disable-next-line prefer-destructuring
|
|
14
|
+
({ connectionId, poolConfig, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
|
|
15
|
+
}
|
|
7
16
|
try {
|
|
8
|
-
const pool = await (0, pool_pg_1.getPoolPg)(connectionId, throwError, registerTypesFunctions);
|
|
17
|
+
const pool = await (0, pool_pg_1.getPoolPg)({ connectionId, poolConfig, throwError, registerTypesFunctions });
|
|
9
18
|
let res;
|
|
10
19
|
if (Array.isArray(sqlValues)) {
|
|
11
20
|
res = await pool.query(sqlText, sqlValues);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":";;;AACA,uCAAsC;AACtC,sCAAwC;AAKjC,MAAM,OAAO,GAAG,KAAK,EAC1B,
|
|
1
|
+
{"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":";;;AACA,uCAAsC;AACtC,sCAAwC;AAKjC,MAAM,OAAO,GAAG,KAAK,EAC1B,GAQC,EACD,OAAe,EACf,SAAiB,EACjB,UAAoB,EACpB,MAAe,EACf,sBAA0C,EAEN,EAAE;IACtC,IAAI,UAAmD,CAAC;IACxD,IAAI,YAAY,GAAW,EAAE,CAAC;IAC9B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,YAAY,GAAG,GAAG,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,gDAAgD;QAChD,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,sBAAsB,EAAE,GAAG,GAAG,CAAC,CAAC;IACvG,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAY,MAAM,IAAA,mBAAS,EAAC,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC;QACxG,IAAI,GAAgB,CAAC;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,oBAAW,EAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;AACH,CAAC,CAAC;AArCW,QAAA,OAAO,WAqClB"}
|
|
@@ -44,9 +44,20 @@ export const getDbConfigPg = (connectionId, includeOptions, throwError) => {
|
|
|
44
44
|
return includeOptions ? config.util.extendDeep(dbOptions, namedDbConfig) : namedDbConfig;
|
|
45
45
|
};
|
|
46
46
|
export const poolsCachePg = {};
|
|
47
|
-
export const getPoolPg = async (
|
|
47
|
+
export const getPoolPg = async (arg, throwError, registerTypesFunctions) => {
|
|
48
|
+
let poolConfig;
|
|
49
|
+
let connectionId = '';
|
|
50
|
+
if (typeof arg === 'string') {
|
|
51
|
+
connectionId = arg;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
// eslint-disable-next-line prefer-destructuring
|
|
55
|
+
({ connectionId, poolConfig, throwError, registerTypesFunctions } = arg);
|
|
56
|
+
}
|
|
48
57
|
if (!poolsCachePg[connectionId]) {
|
|
49
|
-
|
|
58
|
+
if (!poolConfig) {
|
|
59
|
+
poolConfig = getDbConfigPg(connectionId, true, throwError);
|
|
60
|
+
}
|
|
50
61
|
const pool = new Pool(poolConfig);
|
|
51
62
|
poolsCachePg[connectionId] = pool;
|
|
52
63
|
pool.on('error', (err, client) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,IAAI,EAA0B,MAAM,IAAI,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAGzC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,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,QAAQ,EAAE,MAAM;IACnC,oDAAoD;IACpD,gCAAgC;IAChC,GAAG,EAAE,EAAE;IACP,iBAAiB,EAAE,QAAQ,EAAE,0FAA0F;IACvH,aAAa,EAAE,QAAQ,EAAE,iFAAiF;CAC3G,CAAC;AAEF,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAE9D,MAAM,CAAC,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,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;AAC3F,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAuB,EAAE,CAAC;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,17 @@
|
|
|
1
1
|
import { getPoolPg } from './pool-pg';
|
|
2
2
|
import { logSqlError } from '../common';
|
|
3
|
-
export const queryPg = async (
|
|
3
|
+
export const queryPg = async (arg, sqlText, sqlValues, throwError, prefix, registerTypesFunctions) => {
|
|
4
|
+
let poolConfig;
|
|
5
|
+
let connectionId = '';
|
|
6
|
+
if (typeof arg === 'string') {
|
|
7
|
+
connectionId = arg;
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
10
|
+
// eslint-disable-next-line prefer-destructuring
|
|
11
|
+
({ connectionId, poolConfig, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
|
|
12
|
+
}
|
|
4
13
|
try {
|
|
5
|
-
const pool = await getPoolPg(connectionId, throwError, registerTypesFunctions);
|
|
14
|
+
const pool = await getPoolPg({ connectionId, poolConfig, throwError, registerTypesFunctions });
|
|
6
15
|
let res;
|
|
7
16
|
if (Array.isArray(sqlValues)) {
|
|
8
17
|
res = await pool.query(sqlText, sqlValues);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKxC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,
|
|
1
|
+
{"version":3,"file":"query-pg.js","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKxC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,GAQC,EACD,OAAe,EACf,SAAiB,EACjB,UAAoB,EACpB,MAAe,EACf,sBAA0C,EAEN,EAAE;IACtC,IAAI,UAAmD,CAAC;IACxD,IAAI,YAAY,GAAW,EAAE,CAAC;IAC9B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,YAAY,GAAG,GAAG,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,gDAAgD;QAChD,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,sBAAsB,EAAE,GAAG,GAAG,CAAC,CAAC;IACvG,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAY,MAAM,SAAS,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC;QACxG,IAAI,GAAgB,CAAC;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-config.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"i-config.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAEhC,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE;QACP,gBAAgB,EAAE,OAAO,CAAA;KAC1B,CAAC;IACF,IAAI,EAAE;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,iBAAiB,EAAE,MAAM,CAAA;QACzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,yBAAyB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;IACF,sBAAsB,EAAE,OAAO,CAAC;IAChC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,iBAAiB,EAAE,MAAM,CAAA;CAC1B;AAED,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpE,MAAM,WAAW,YAAY;IAK3B,uBAAuB,EAAE,MAAM,CAAC;IAIhC,iBAAiB,EAAE,MAAM,CAAC;IAG1B,GAAG,EAAE,EAAE,CAAC;IACR,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,MAAM;IACrB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,MAAM;IACrB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE;QACF,KAAK,CAAC,EAAE;YACN,OAAO,CAAC,EAAE,YAAY,CAAC;YACvB,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;QACF,QAAQ,CAAC,EAAE;YACT,OAAO,CAAC,EAAE,YAAY,CAAC;YACvB,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAC;CACH"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { PoolConfig } from 'pg';
|
|
2
|
+
import { IDbOptionsPg, IRegisterTypeFn } from '../@types/i-config';
|
|
2
3
|
import { IConnectionPoolsPg, IPoolPg } from '../@types/i-pg';
|
|
3
4
|
export declare const getDbConfigPg: <T>(connectionId: string, includeOptions?: boolean, throwError?: boolean) => T | undefined;
|
|
4
5
|
export declare const poolsCachePg: IConnectionPoolsPg;
|
|
5
|
-
export declare const getPoolPg: (
|
|
6
|
+
export declare const getPoolPg: (arg: {
|
|
7
|
+
connectionId: string;
|
|
8
|
+
poolConfig?: PoolConfig & IDbOptionsPg;
|
|
9
|
+
throwError?: boolean;
|
|
10
|
+
registerTypesFunctions?: IRegisterTypeFn[];
|
|
11
|
+
} | string, throwError?: boolean, registerTypesFunctions?: IRegisterTypeFn[]) => Promise<IPoolPg>;
|
|
6
12
|
export declare const closePoolPg: (connectionId: string) => Promise<boolean>;
|
|
7
13
|
export declare const closeAllPgConnectionsPg: () => Promise<boolean[]>;
|
|
8
14
|
//# sourceMappingURL=pool-pg.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pool-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,UAAU,EAAE,MAAM,IAAI,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAU,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAiB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAmC5E,eAAO,MAAM,aAAa,GAAI,CAAC,gBAAiB,MAAM,mBAAmB,OAAO,eAAe,OAAO,KAAG,CAAC,GAAG,SAS5G,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,kBAAuB,CAAC;AAEnD,eAAO,MAAM,SAAS,QAAe;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sBAAsB,CAAC,EAAE,eAAe,EAAE,CAAA;CAC3C,GAAG,MAAM,eAAe,OAAO,2BAA2B,eAAe,EAAE,KAAG,OAAO,CAAC,OAAO,CAkC7F,CAAC;AAEF,eAAO,MAAM,WAAW,iBAAwB,MAAM,KAAG,OAAO,CAAC,OAAO,CAavE,CAAC;AAEF,eAAO,MAAM,uBAAuB,0BAAsG,CAAC"}
|
|
@@ -1,5 +1,13 @@
|
|
|
1
|
-
import { QueryResult } from 'pg';
|
|
1
|
+
import { PoolConfig, QueryResult } from 'pg';
|
|
2
2
|
import { TDBRecord } from '../@types/i-common';
|
|
3
|
-
import { IRegisterTypeFn } from '../@types/i-config';
|
|
4
|
-
export declare const queryPg: <R extends TDBRecord = any>(
|
|
3
|
+
import { IDbOptionsPg, IRegisterTypeFn } from '../@types/i-config';
|
|
4
|
+
export declare const queryPg: <R extends TDBRecord = any>(arg: string | {
|
|
5
|
+
connectionId: string;
|
|
6
|
+
poolConfig?: PoolConfig & IDbOptionsPg;
|
|
7
|
+
sqlText: string;
|
|
8
|
+
sqlValues?: any[];
|
|
9
|
+
throwError?: boolean;
|
|
10
|
+
prefix?: string;
|
|
11
|
+
registerTypesFunctions?: IRegisterTypeFn[];
|
|
12
|
+
}, sqlText: string, sqlValues?: any[], throwError?: boolean, prefix?: string, registerTypesFunctions?: IRegisterTypeFn[]) => Promise<QueryResult<R> | undefined>;
|
|
5
13
|
//# sourceMappingURL=query-pg.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"query-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAI7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEnE,eAAO,MAAM,OAAO,GAAU,CAAC,SAAS,SAAS,aAC1C,MAAM,GAAG;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,eAAe,EAAE,CAAC;CAC5C,WACQ,MAAM,cACH,GAAG,EAAE,eACJ,OAAO,WACX,MAAM,2BACU,eAAe,EAAE,KAE1C,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAqBnC,CAAC"}
|
package/package.json
CHANGED
package/src/@types/i-config.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { PoolClient } from "pg";
|
|
1
|
+
import { PoolClient } from 'pg';
|
|
3
2
|
|
|
4
3
|
export interface IDBConfigCommon {
|
|
4
|
+
label?: string,
|
|
5
5
|
dialect?: 'mssql' | 'pg',
|
|
6
6
|
port: string | number | null | undefined,
|
|
7
7
|
database: string,
|
package/src/pg/pool-pg.ts
CHANGED
|
@@ -52,9 +52,25 @@ export const getDbConfigPg = <T> (connectionId: string, includeOptions?: boolean
|
|
|
52
52
|
|
|
53
53
|
export const poolsCachePg: IConnectionPoolsPg = {};
|
|
54
54
|
|
|
55
|
-
export const getPoolPg = async (
|
|
55
|
+
export const getPoolPg = async (arg: {
|
|
56
|
+
connectionId: string,
|
|
57
|
+
poolConfig?: PoolConfig & IDbOptionsPg,
|
|
58
|
+
throwError?: boolean,
|
|
59
|
+
registerTypesFunctions?: IRegisterTypeFn[]
|
|
60
|
+
} | string, throwError?: boolean, registerTypesFunctions?: IRegisterTypeFn[]): Promise<IPoolPg> => {
|
|
61
|
+
let poolConfig: (PoolConfig & IDbOptionsPg) | undefined;
|
|
62
|
+
let connectionId: string = '';
|
|
63
|
+
if (typeof arg === 'string') {
|
|
64
|
+
connectionId = arg;
|
|
65
|
+
} else {
|
|
66
|
+
// eslint-disable-next-line prefer-destructuring
|
|
67
|
+
({ connectionId, poolConfig, throwError, registerTypesFunctions } = arg);
|
|
68
|
+
}
|
|
69
|
+
|
|
56
70
|
if (!poolsCachePg[connectionId]) {
|
|
57
|
-
|
|
71
|
+
if (!poolConfig) {
|
|
72
|
+
poolConfig = getDbConfigPg<PoolConfig & IDbOptionsPg>(connectionId, true, throwError) as PoolConfig & IDbOptionsPg;
|
|
73
|
+
}
|
|
58
74
|
const pool = new Pool(poolConfig) as IPoolPg;
|
|
59
75
|
poolsCachePg[connectionId] = pool;
|
|
60
76
|
pool.on('error', (err: Error, client: PoolClient) => {
|
package/src/pg/query-pg.ts
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
|
-
import { QueryResult } from 'pg';
|
|
1
|
+
import { PoolConfig, QueryResult } from 'pg';
|
|
2
2
|
import { getPoolPg } from './pool-pg';
|
|
3
3
|
import { logSqlError } from '../common';
|
|
4
4
|
import { IPoolPg } from '../@types/i-pg';
|
|
5
5
|
import { TDBRecord } from '../@types/i-common';
|
|
6
|
-
import { IRegisterTypeFn } from '../@types/i-config';
|
|
6
|
+
import { IDbOptionsPg, IRegisterTypeFn } from '../@types/i-config';
|
|
7
7
|
|
|
8
8
|
export const queryPg = async <R extends TDBRecord = any> (
|
|
9
|
-
|
|
9
|
+
arg: string | {
|
|
10
|
+
connectionId: string,
|
|
11
|
+
poolConfig?: PoolConfig & IDbOptionsPg,
|
|
12
|
+
sqlText: string,
|
|
13
|
+
sqlValues?: any[],
|
|
14
|
+
throwError?: boolean,
|
|
15
|
+
prefix?: string,
|
|
16
|
+
registerTypesFunctions?: IRegisterTypeFn[],
|
|
17
|
+
},
|
|
10
18
|
sqlText: string,
|
|
11
19
|
sqlValues?: any[],
|
|
12
20
|
throwError?: boolean,
|
|
@@ -14,8 +22,16 @@ export const queryPg = async <R extends TDBRecord = any> (
|
|
|
14
22
|
registerTypesFunctions?: IRegisterTypeFn[],
|
|
15
23
|
):
|
|
16
24
|
Promise<QueryResult<R> | undefined> => {
|
|
25
|
+
let poolConfig: (PoolConfig & IDbOptionsPg) | undefined;
|
|
26
|
+
let connectionId: string = '';
|
|
27
|
+
if (typeof arg === 'string') {
|
|
28
|
+
connectionId = arg;
|
|
29
|
+
} else {
|
|
30
|
+
// eslint-disable-next-line prefer-destructuring
|
|
31
|
+
({ connectionId, poolConfig, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
|
|
32
|
+
}
|
|
17
33
|
try {
|
|
18
|
-
const pool: IPoolPg = await getPoolPg(connectionId, throwError, registerTypesFunctions);
|
|
34
|
+
const pool: IPoolPg = await getPoolPg({ connectionId, poolConfig, throwError, registerTypesFunctions });
|
|
19
35
|
let res: QueryResult;
|
|
20
36
|
if (Array.isArray(sqlValues)) {
|
|
21
37
|
res = await pool.query(sqlText, sqlValues);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"root":["../../src/common.ts","../../src/debug.ts","../../src/index.ts","../../src/logger-error.ts","../../src/@types/i-common.ts","../../src/@types/i-config.ts","../../src/@types/i-data-types-ms.ts","../../src/@types/i-data-types-pg.ts","../../src/@types/i-ms.ts","../../src/@types/i-pg.ts","../../src/ms/gen-table-interfaces-ms.ts","../../src/ms/pool-ms.ts","../../src/ms/prepare-value.ts","../../src/ms/query-ms.ts","../../src/ms/table-schema-ms.ts","../../src/ms/utils-ms.ts","../../src/ms/wrap-transaction-ms.ts","../../src/ms/get-sql/insert.ts","../../src/ms/get-sql/merge.ts","../../src/ms/get-sql/update.ts","../../src/pg/gen-table-interfaces-pg.ts","../../src/pg/insert-pg.ts","../../src/pg/is-table-or-view-exists.ts","../../src/pg/pool-pg.ts","../../src/pg/prepare-value.ts","../../src/pg/query-pg.ts","../../src/pg/table-schema-pg.ts","../../src/pg/utils-pg.ts","../../src/pg/get-sql/insert.ts","../../src/pg/get-sql/merge.ts","../../src/pg/get-sql/reset-sequence.ts","../../src/pg/get-sql/update.ts","../../src/utils/utils-array.ts","../../src/utils/utils-dt.ts","../../src/utils/utils-num.ts","../../src/utils/utils.ts","../../__tests__/01_node_env.spec.ts","../../__tests__/global-setup.ts","../../__tests__/global-teardown.ts","../../__tests__/db/ms/ms-get-sql.spec.ts","../../__tests__/db/ms/ms-prepare-sql-value.spec.ts","../../__tests__/db/ms/ms-table-schema.spec.ts","../../__tests__/db/ms/@gen-types/test-table_schema.ts","../../__tests__/db/pg/gen-table-interfaces-4-test-pg.ts","../../__tests__/db/pg/pg-get-sql.spec.ts","../../__tests__/db/pg/pg-insert.spec.ts","../../__tests__/db/pg/pg-prepare-sql-value.spec.ts","../../__tests__/db/pg/pg-table-schema.spec.ts","../../__tests__/db/pg/@gen-types/test-hard_case.ts","../../__tests__/db/pg/@gen-types/test-only_one_serial.ts","../../__tests__/db/pg/@gen-types/test-only_one_uniq.ts","../../__tests__/db/pg/@gen-types/test-serial_and_uniq.ts","../../__tests__/db/pg/@gen-types/test-table_schema.ts","../../__tests__/db/pg/array-string-escape/pg-array-string-escape.spec.ts"],"version":"5.6.2"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"root":["../../src/common.ts","../../src/debug.ts","../../src/index.ts","../../src/logger-error.ts","../../src/@types/i-common.ts","../../src/@types/i-config.ts","../../src/@types/i-data-types-ms.ts","../../src/@types/i-data-types-pg.ts","../../src/@types/i-ms.ts","../../src/@types/i-pg.ts","../../src/ms/gen-table-interfaces-ms.ts","../../src/ms/pool-ms.ts","../../src/ms/prepare-value.ts","../../src/ms/query-ms.ts","../../src/ms/table-schema-ms.ts","../../src/ms/utils-ms.ts","../../src/ms/wrap-transaction-ms.ts","../../src/ms/get-sql/insert.ts","../../src/ms/get-sql/merge.ts","../../src/ms/get-sql/update.ts","../../src/pg/gen-table-interfaces-pg.ts","../../src/pg/insert-pg.ts","../../src/pg/is-table-or-view-exists.ts","../../src/pg/pool-pg.ts","../../src/pg/prepare-value.ts","../../src/pg/query-pg.ts","../../src/pg/table-schema-pg.ts","../../src/pg/utils-pg.ts","../../src/pg/get-sql/insert.ts","../../src/pg/get-sql/merge.ts","../../src/pg/get-sql/reset-sequence.ts","../../src/pg/get-sql/update.ts","../../src/utils/utils-array.ts","../../src/utils/utils-dt.ts","../../src/utils/utils-num.ts","../../src/utils/utils.ts"],"version":"5.6.2"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"root":["../../src/common.ts","../../src/debug.ts","../../src/index.ts","../../src/logger-error.ts","../../src/@types/i-common.ts","../../src/@types/i-config.ts","../../src/@types/i-data-types-ms.ts","../../src/@types/i-data-types-pg.ts","../../src/@types/i-ms.ts","../../src/@types/i-pg.ts","../../src/ms/gen-table-interfaces-ms.ts","../../src/ms/pool-ms.ts","../../src/ms/prepare-value.ts","../../src/ms/query-ms.ts","../../src/ms/table-schema-ms.ts","../../src/ms/utils-ms.ts","../../src/ms/wrap-transaction-ms.ts","../../src/ms/get-sql/insert.ts","../../src/ms/get-sql/merge.ts","../../src/ms/get-sql/update.ts","../../src/pg/gen-table-interfaces-pg.ts","../../src/pg/insert-pg.ts","../../src/pg/is-table-or-view-exists.ts","../../src/pg/pool-pg.ts","../../src/pg/prepare-value.ts","../../src/pg/query-pg.ts","../../src/pg/table-schema-pg.ts","../../src/pg/utils-pg.ts","../../src/pg/get-sql/insert.ts","../../src/pg/get-sql/merge.ts","../../src/pg/get-sql/reset-sequence.ts","../../src/pg/get-sql/update.ts","../../src/utils/utils-array.ts","../../src/utils/utils-dt.ts","../../src/utils/utils-num.ts","../../src/utils/utils.ts"],"version":"5.6.2"}
|