af-db-ts 3.0.13 → 3.0.15

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.
@@ -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,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,wDAI8B;AAH5B,uHAAA,oBAAoB,OAAA;AACpB,mHAAA,gBAAgB,OAAA;AAChB,oHAAA,iBAAiB,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;AAiB1B,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,wDAI8B;AAH5B,uHAAA,oBAAoB,OAAA;AACpB,mHAAA,gBAAgB,OAAA;AAChB,oHAAA,iBAAiB,OAAA"}
@@ -6,14 +6,15 @@ const common_1 = require("../common");
6
6
  const queryPg = async (arg, sqlText, sqlValues, throwError, prefix, registerTypesFunctions) => {
7
7
  let poolConfig;
8
8
  let connectionId = '';
9
+ let pool;
9
10
  if (typeof arg === 'string') {
10
11
  connectionId = arg;
11
12
  }
12
13
  else {
13
- ({ connectionId, poolConfig, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
14
+ ({ connectionId, poolConfig, client: pool, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
14
15
  }
15
16
  try {
16
- const pool = await (0, pool_pg_1.getPoolPg)({ connectionId, poolConfig, throwError, registerTypesFunctions });
17
+ pool = pool || (await (0, pool_pg_1.getPoolPg)({ connectionId, poolConfig, throwError, registerTypesFunctions }));
17
18
  let res;
18
19
  if (Array.isArray(sqlValues)) {
19
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,GAQC,EACD,OAAgB,EAChB,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,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,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACxC,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;AApCW,QAAA,OAAO,WAoClB"}
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,GAA0B,EAC1B,OAAgB,EAChB,SAAiB,EACjB,UAAoB,EACpB,MAAe,EACf,sBAA0C,EAEN,EAAE;IACtC,IAAI,UAAmD,CAAC;IACxD,IAAI,YAAY,GAAW,EAAE,CAAC;IAC9B,IAAI,IAAyB,CAAC;IAC9B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,YAAY,GAAG,GAAG,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,sBAAsB,EAAE,GAAG,GAAG,CAAC,CAAC;IACrH,CAAC;IACD,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,IAAA,mBAAS,EAAC,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;QACnG,IAAI,GAAgB,CAAC;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACxC,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;AA7BW,QAAA,OAAO,WA6BlB"}
@@ -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,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,EAChB,iBAAiB,GAClB,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;AAiB7D,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,EAChB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC"}
@@ -3,14 +3,15 @@ import { logSqlError } from '../common';
3
3
  export const queryPg = async (arg, sqlText, sqlValues, throwError, prefix, registerTypesFunctions) => {
4
4
  let poolConfig;
5
5
  let connectionId = '';
6
+ let pool;
6
7
  if (typeof arg === 'string') {
7
8
  connectionId = arg;
8
9
  }
9
10
  else {
10
- ({ connectionId, poolConfig, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
11
+ ({ connectionId, poolConfig, client: pool, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
11
12
  }
12
13
  try {
13
- const pool = await getPoolPg({ connectionId, poolConfig, throwError, registerTypesFunctions });
14
+ pool = pool || (await getPoolPg({ connectionId, poolConfig, throwError, registerTypesFunctions }));
14
15
  let res;
15
16
  if (Array.isArray(sqlValues)) {
16
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,GAQC,EACD,OAAgB,EAChB,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,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,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACxC,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
+ {"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,GAA0B,EAC1B,OAAgB,EAChB,SAAiB,EACjB,UAAoB,EACpB,MAAe,EACf,sBAA0C,EAEN,EAAE;IACtC,IAAI,UAAmD,CAAC;IACxD,IAAI,YAAY,GAAW,EAAE,CAAC;IAC9B,IAAI,IAAyB,CAAC;IAC9B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,YAAY,GAAG,GAAG,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,sBAAsB,EAAE,GAAG,GAAG,CAAC,CAAC;IACrH,CAAC;IACD,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,SAAS,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC;QACnG,IAAI,GAAgB,CAAC;QACrB,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACxC,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,6 +1,7 @@
1
- import { Pool, PoolClient } from 'pg';
1
+ import { Pool, PoolClient, PoolConfig } from 'pg';
2
2
  import { IFieldDef, TFieldName } from './i-common';
3
3
  import { TDataTypePg } from './i-data-types-pg';
4
+ import { IDbOptionsPg, IRegisterTypeFn } from './i-config';
4
5
  export interface IFieldDefPg extends IFieldDef {
5
6
  dataType?: TDataTypePg;
6
7
  arrayType?: TDataTypePg;
@@ -37,4 +38,14 @@ export interface IPoolPg extends Pool {
37
38
  export interface IConnectionPoolsPg {
38
39
  [connectionId: string]: IPoolPg;
39
40
  }
41
+ export interface IQueryPgArgs {
42
+ connectionId: string;
43
+ poolConfig?: PoolConfig & IDbOptionsPg;
44
+ client?: IPoolPg;
45
+ sqlText: string;
46
+ sqlValues?: any[];
47
+ throwError?: boolean;
48
+ prefix?: string;
49
+ registerTypesFunctions?: IRegisterTypeFn[];
50
+ }
40
51
  //# sourceMappingURL=i-pg.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"i-pg.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;CAClC;AAED,MAAM,WAAW,oBAAoB;IACnC,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,gBAAgB,CAAC;IAChC,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,oBAAoB,CAAC;IACzB,QAAQ,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,oBAAoB,EAAE,UAAU,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,OAAQ,SAAQ,IAAI;IACnC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC"}
1
+ {"version":3,"file":"i-pg.d.ts","sourceRoot":"","sources":["../../../../src/@types/i-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE3D,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC;CAClC;AAED,MAAM,WAAW,oBAAoB;IACnC,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,gBAAgB,CAAC;IAChC,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,oBAAoB,CAAC;IACzB,QAAQ,EAAE;QAAE,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC1C,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,cAAc,EAAE,UAAU,EAAE,CAAC;IAC7B,UAAU,EAAE,UAAU,EAAE,CAAC;IACzB,oBAAoB,EAAE,UAAU,EAAE,CAAC;CACpC;AAED,MAAM,WAAW,aAAc,SAAQ,UAAU;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,OAAQ,SAAQ,IAAI;IACnC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;CAChC;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,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"}
@@ -17,7 +17,7 @@ export { prepareSqlValueMs, prepareSqlStringMs, escapeStringMs, } from './ms/pre
17
17
  export { queryMs } from './ms/query-ms';
18
18
  export { getTableSchemaMs, correctRecordSchemaMs, } from './ms/table-schema-ms';
19
19
  export { wrapTransactionMs } from './ms/wrap-transaction-ms';
20
- export { IFieldDefPg, TColumnsSchemaPg, ITableSchemaPg, TUniqueConstraintsPg, IPoolPg, IConnectionPoolsPg, IPoolClientPg, } from './@types/i-pg';
20
+ export { IFieldDefPg, TColumnsSchemaPg, ITableSchemaPg, TUniqueConstraintsPg, IPoolPg, IConnectionPoolsPg, IPoolClientPg, IQueryPgArgs, } from './@types/i-pg';
21
21
  export { TDataTypePg } from './@types/i-data-types-pg';
22
22
  export { genTableInterfacePg, genTableInterfacesPg, } from './pg/gen-table-interfaces-pg';
23
23
  export { getJsTypeByTypePg, getTypeByUdtNamePg, getNormalizedTypePg, } from './pg/utils-pg';
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,eAAe,EACf,QAAQ,EACR,UAAU,EACV,UAAU,EACV,UAAU,EACV,kBAAkB,GACnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,WAAW,EACX,MAAM,EACN,MAAM,EACN,eAAe,EACf,YAAY,EACZ,YAAY,GACb,MAAM,mBAAmB,CAAC;AAE3B,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;AAI3B,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,EAClB,2BAA2B,GAC5B,MAAM,eAAe,CAAC;AAEvB,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;AAI7D,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,cAAc,EACd,oBAAoB,EACpB,OAAO,EACP,kBAAkB,EAClB,aAAa,GACd,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,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,EAChB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,6 @@
1
- import { PoolConfig, QueryResult } from 'pg';
1
+ import { QueryResult } from 'pg';
2
+ import { IQueryPgArgs } from '../@types/i-pg';
2
3
  import { TDBRecord } from '../@types/i-common';
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>;
4
+ import { IRegisterTypeFn } from '../@types/i-config';
5
+ export declare const queryPg: <R extends TDBRecord = any>(arg: string | IQueryPgArgs, sqlText?: string, sqlValues?: any[], throwError?: boolean, prefix?: string, registerTypesFunctions?: IRegisterTypeFn[]) => Promise<QueryResult<R> | undefined>;
13
6
  //# 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,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,YACS,MAAM,cACJ,GAAG,EAAE,eACJ,OAAO,WACX,MAAM,2BACU,eAAe,EAAE,KAE1C,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAoBnC,CAAC"}
1
+ {"version":3,"file":"query-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/query-pg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,WAAW,EAAE,MAAM,IAAI,CAAC;AAG7C,OAAO,EAAW,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAgB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAEnE,eAAO,MAAM,OAAO,GAAU,CAAC,SAAS,SAAS,aAC1C,MAAM,GAAG,YAAY,YAChB,MAAM,cACJ,GAAG,EAAE,eACJ,OAAO,WACX,MAAM,2BACU,eAAe,EAAE,KAE1C,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAqBnC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "af-db-ts",
3
- "version": "3.0.13",
3
+ "version": "3.0.15",
4
4
  "description": "A highly specialized function library",
5
5
  "main": "./dist/cjs/src/index.js",
6
6
  "module": "./dist/esm/src/index.js",
@@ -1,6 +1,7 @@
1
- import { Pool, PoolClient } from 'pg';
1
+ import { Pool, PoolClient, PoolConfig } from 'pg';
2
2
  import { IFieldDef, TFieldName } from './i-common';
3
3
  import { TDataTypePg } from './i-data-types-pg';
4
+ import { IDbOptionsPg, IRegisterTypeFn } from './i-config';
4
5
 
5
6
  export interface IFieldDefPg extends IFieldDef {
6
7
  dataType?: TDataTypePg,
@@ -42,3 +43,14 @@ export interface IPoolPg extends Pool {
42
43
  export interface IConnectionPoolsPg {
43
44
  [connectionId: string]: IPoolPg
44
45
  }
46
+
47
+ export interface IQueryPgArgs {
48
+ connectionId: string,
49
+ poolConfig?: PoolConfig & IDbOptionsPg,
50
+ client?: IPoolPg,
51
+ sqlText: string,
52
+ sqlValues?: any[],
53
+ throwError?: boolean,
54
+ prefix?: string,
55
+ registerTypesFunctions?: IRegisterTypeFn[],
56
+ }
package/src/index.ts CHANGED
@@ -115,6 +115,7 @@ export {
115
115
  IPoolPg,
116
116
  IConnectionPoolsPg,
117
117
  IPoolClientPg,
118
+ IQueryPgArgs,
118
119
  } from './@types/i-pg';
119
120
 
120
121
  export { TDataTypePg } from './@types/i-data-types-pg';
@@ -1,20 +1,12 @@
1
1
  import { PoolConfig, QueryResult } from 'pg';
2
2
  import { getPoolPg } from './pool-pg';
3
3
  import { logSqlError } from '../common';
4
- import { IPoolPg } from '../@types/i-pg';
4
+ import { IPoolPg, IQueryPgArgs } from '../@types/i-pg';
5
5
  import { TDBRecord } from '../@types/i-common';
6
6
  import { IDbOptionsPg, IRegisterTypeFn } from '../@types/i-config';
7
7
 
8
8
  export const queryPg = async <R extends TDBRecord = any> (
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
- },
9
+ arg: string | IQueryPgArgs,
18
10
  sqlText?: string,
19
11
  sqlValues?: any[],
20
12
  throwError?: boolean,
@@ -24,13 +16,14 @@ export const queryPg = async <R extends TDBRecord = any> (
24
16
  Promise<QueryResult<R> | undefined> => {
25
17
  let poolConfig: (PoolConfig & IDbOptionsPg) | undefined;
26
18
  let connectionId: string = '';
19
+ let pool: IPoolPg | undefined;
27
20
  if (typeof arg === 'string') {
28
21
  connectionId = arg;
29
22
  } else {
30
- ({ connectionId, poolConfig, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
23
+ ({ connectionId, poolConfig, client: pool, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
31
24
  }
32
25
  try {
33
- const pool: IPoolPg = await getPoolPg({ connectionId, poolConfig, throwError, registerTypesFunctions });
26
+ pool = pool || (await getPoolPg({ connectionId, poolConfig, throwError, registerTypesFunctions }));
34
27
  let res: QueryResult;
35
28
  if (Array.isArray(sqlValues)) {
36
29
  res = await pool.query(sqlText || '', sqlValues);