@pi-r/postgres 0.3.6 → 0.3.7
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/client/index.js +3 -4
- package/package.json +1 -1
package/client/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
|
|
4
|
+
const postgres = require("pg");
|
|
4
5
|
const util_1 = require("@e-mc/db/util");
|
|
5
6
|
const types_1 = require("@e-mc/types");
|
|
6
7
|
const Db = require("@e-mc/db");
|
|
@@ -86,7 +87,6 @@ function setCredential(item) {
|
|
|
86
87
|
}
|
|
87
88
|
const poolKey = getPoolKey(credential);
|
|
88
89
|
if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
|
|
89
|
-
const { Pool } = require("pg");
|
|
90
90
|
const config = this.getPoolConfig("postgres", password);
|
|
91
91
|
if (config) {
|
|
92
92
|
const { min, max, idle } = config;
|
|
@@ -100,7 +100,7 @@ function setCredential(item) {
|
|
|
100
100
|
(_d = credential.idleTimeoutMillis) !== null && _d !== void 0 ? _d : (credential.idleTimeoutMillis = idle);
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
|
-
new PostgresPool(new Pool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
103
|
+
new PostgresPool(new postgres.Pool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
104
104
|
}
|
|
105
105
|
else {
|
|
106
106
|
pool.add(item);
|
|
@@ -120,7 +120,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
120
120
|
if (length === 0) {
|
|
121
121
|
return [];
|
|
122
122
|
}
|
|
123
|
-
const db = require("pg");
|
|
124
123
|
let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
125
124
|
if ((0, types_1.isPlainObject)(options)) {
|
|
126
125
|
({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
|
|
@@ -184,7 +183,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
184
183
|
}
|
|
185
184
|
}
|
|
186
185
|
if (!client) {
|
|
187
|
-
clients.push(client = new
|
|
186
|
+
clients.push(client = new postgres.Client((postgresCredential || credential)));
|
|
188
187
|
await client.connect();
|
|
189
188
|
}
|
|
190
189
|
if (connectOnce) {
|