af-db-ts 3.0.12 → 3.0.14
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/pg/query-pg.js +3 -2
- package/dist/cjs/src/pg/query-pg.js.map +1 -1
- package/dist/esm/src/pg/query-pg.js +3 -2
- package/dist/esm/src/pg/query-pg.js.map +1 -1
- package/dist/types/src/@types/i-config.d.ts +4 -0
- package/dist/types/src/@types/i-config.d.ts.map +1 -1
- package/dist/types/src/pg/query-pg.d.ts +2 -0
- package/dist/types/src/pg/query-pg.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/@types/i-config.ts +4 -0
- package/src/pg/query-pg.ts +4 -2
|
@@ -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
|
-
|
|
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,
|
|
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,GASC,EACD,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;AAtCW,QAAA,OAAO,WAsClB"}
|
|
@@ -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
|
-
|
|
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,
|
|
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,GASC,EACD,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,4 +1,6 @@
|
|
|
1
1
|
import { PoolClient } from 'pg';
|
|
2
|
+
import { IOptions } from 'mssql';
|
|
3
|
+
import { ConnectionAuthentication } from 'tedious';
|
|
2
4
|
export interface IDBConfigCommon {
|
|
3
5
|
label?: string;
|
|
4
6
|
dialect?: 'mssql' | 'pg';
|
|
@@ -9,6 +11,8 @@ export interface IDBConfigCommon {
|
|
|
9
11
|
}
|
|
10
12
|
export interface IDBConfigMs extends IDBConfigCommon {
|
|
11
13
|
server: string;
|
|
14
|
+
options?: IOptions | undefined;
|
|
15
|
+
authentication?: ConnectionAuthentication | undefined;
|
|
12
16
|
}
|
|
13
17
|
export interface IDBConfigPg extends IDBConfigCommon {
|
|
14
18
|
host: string;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEnD,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;IACf,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC/B,cAAc,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;CACvD;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,9 +1,11 @@
|
|
|
1
1
|
import { PoolConfig, QueryResult } from 'pg';
|
|
2
|
+
import { IPoolPg } from '../@types/i-pg';
|
|
2
3
|
import { TDBRecord } from '../@types/i-common';
|
|
3
4
|
import { IDbOptionsPg, IRegisterTypeFn } from '../@types/i-config';
|
|
4
5
|
export declare const queryPg: <R extends TDBRecord = any>(arg: string | {
|
|
5
6
|
connectionId: string;
|
|
6
7
|
poolConfig?: PoolConfig & IDbOptionsPg;
|
|
8
|
+
client?: IPoolPg;
|
|
7
9
|
sqlText: string;
|
|
8
10
|
sqlValues?: any[];
|
|
9
11
|
throwError?: boolean;
|
|
@@ -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;
|
|
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;AAG7C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,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,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,YACS,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
package/src/@types/i-config.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { PoolClient } from 'pg';
|
|
2
|
+
import { IOptions } from 'mssql';
|
|
3
|
+
import { ConnectionAuthentication } from 'tedious';
|
|
2
4
|
|
|
3
5
|
export interface IDBConfigCommon {
|
|
4
6
|
label?: string,
|
|
@@ -11,6 +13,8 @@ export interface IDBConfigCommon {
|
|
|
11
13
|
|
|
12
14
|
export interface IDBConfigMs extends IDBConfigCommon {
|
|
13
15
|
server: string,
|
|
16
|
+
options?: IOptions | undefined;
|
|
17
|
+
authentication?: ConnectionAuthentication | undefined;
|
|
14
18
|
}
|
|
15
19
|
|
|
16
20
|
export interface IDBConfigPg extends IDBConfigCommon {
|
package/src/pg/query-pg.ts
CHANGED
|
@@ -9,6 +9,7 @@ export const queryPg = async <R extends TDBRecord = any> (
|
|
|
9
9
|
arg: string | {
|
|
10
10
|
connectionId: string,
|
|
11
11
|
poolConfig?: PoolConfig & IDbOptionsPg,
|
|
12
|
+
client?: IPoolPg,
|
|
12
13
|
sqlText: string,
|
|
13
14
|
sqlValues?: any[],
|
|
14
15
|
throwError?: boolean,
|
|
@@ -24,13 +25,14 @@ export const queryPg = async <R extends TDBRecord = any> (
|
|
|
24
25
|
Promise<QueryResult<R> | undefined> => {
|
|
25
26
|
let poolConfig: (PoolConfig & IDbOptionsPg) | undefined;
|
|
26
27
|
let connectionId: string = '';
|
|
28
|
+
let pool: IPoolPg | undefined;
|
|
27
29
|
if (typeof arg === 'string') {
|
|
28
30
|
connectionId = arg;
|
|
29
31
|
} else {
|
|
30
|
-
({ connectionId, poolConfig, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
|
|
32
|
+
({ connectionId, poolConfig, client: pool, sqlText, sqlValues, throwError, prefix, registerTypesFunctions } = arg);
|
|
31
33
|
}
|
|
32
34
|
try {
|
|
33
|
-
|
|
35
|
+
pool = pool || (await getPoolPg({ connectionId, poolConfig, throwError, registerTypesFunctions }));
|
|
34
36
|
let res: QueryResult;
|
|
35
37
|
if (Array.isArray(sqlValues)) {
|
|
36
38
|
res = await pool.query(sqlText || '', sqlValues);
|