@pi-r/oracle 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 +4 -5
- 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 = void 0;
|
|
4
|
+
const oracledb = require("oracledb");
|
|
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");
|
|
@@ -127,7 +128,6 @@ async function setCredential(item) {
|
|
|
127
128
|
const poolKey = getPoolKey(credential);
|
|
128
129
|
if (poolKey) {
|
|
129
130
|
if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
|
|
130
|
-
const { createPool } = require("oracledb");
|
|
131
131
|
const config = this.getPoolConfig("oracle", password);
|
|
132
132
|
if (config) {
|
|
133
133
|
const { min, max, idle, queue_max, queue_idle } = config;
|
|
@@ -147,7 +147,7 @@ async function setCredential(item) {
|
|
|
147
147
|
(_e = credential.queueTimeout) !== null && _e !== void 0 ? _e : (credential.queueTimeout = queue_idle);
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
|
-
new OraclePool(await createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
150
|
+
new OraclePool(await oracledb.createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
|
|
151
151
|
}
|
|
152
152
|
else {
|
|
153
153
|
pool.add(item);
|
|
@@ -168,7 +168,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
168
168
|
if (length === 0) {
|
|
169
169
|
return [];
|
|
170
170
|
}
|
|
171
|
-
const db = require("oracledb");
|
|
172
171
|
let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
173
172
|
if ((0, types_1.isPlainObject)(options)) {
|
|
174
173
|
({ parallel, connectOnce, errorQuery, sessionKey } = options);
|
|
@@ -229,7 +228,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
229
228
|
pool.connected = false;
|
|
230
229
|
}
|
|
231
230
|
}
|
|
232
|
-
clients.push(client || (client = await
|
|
231
|
+
clients.push(client || (client = await oracledb.getConnection((oracleCredential || credential))));
|
|
233
232
|
if (connectOnce) {
|
|
234
233
|
if (!parallel) {
|
|
235
234
|
oracleClient = client;
|
|
@@ -300,7 +299,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
300
299
|
if (oracleClient && parallel) {
|
|
301
300
|
oracleClient = undefined;
|
|
302
301
|
}
|
|
303
|
-
const executeOptions = { outFormat:
|
|
302
|
+
const executeOptions = { outFormat: oracledb.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
|
|
304
303
|
commandType = this.commandType.SELECT;
|
|
305
304
|
if (streamRow) {
|
|
306
305
|
const rows = [];
|