@pi-r/oracle 0.7.6 → 0.7.8
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 +6 -5
- package/package.json +3 -3
- package/types/index.d.ts +1 -1
package/client/index.js
CHANGED
|
@@ -222,9 +222,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
222
222
|
if (length === 0) {
|
|
223
223
|
return [];
|
|
224
224
|
}
|
|
225
|
-
let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
225
|
+
let parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
|
|
226
226
|
if ((0, types_1.isPlainObject)(options)) {
|
|
227
|
-
({ parallel, connectOnce, errorQuery, sessionKey } = options);
|
|
227
|
+
({ parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
|
|
228
228
|
}
|
|
229
229
|
else {
|
|
230
230
|
if (typeof options === 'string') {
|
|
@@ -359,7 +359,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
359
359
|
}
|
|
360
360
|
const executeOptions = { outFormat: oracledb.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
|
|
361
361
|
commandType = this.commandType.SELECT;
|
|
362
|
-
if (streamRow) {
|
|
362
|
+
if (streamRow && (0, types_1.isString)(query)) {
|
|
363
363
|
const rows = [];
|
|
364
364
|
const processRow = typeof streamRow === 'function' && streamRow;
|
|
365
365
|
const stream = client.queryStream(query, params || [], executeOptions);
|
|
@@ -415,14 +415,15 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
415
415
|
}
|
|
416
416
|
}
|
|
417
417
|
return this.processRows(batch, tasks, {
|
|
418
|
+
parallel,
|
|
419
|
+
errorAsEmpty,
|
|
418
420
|
disconnect: () => clients.forEach(item => {
|
|
419
421
|
item.close(err => {
|
|
420
422
|
if (err) {
|
|
421
423
|
this.writeFail(["Unable to close connnection", "oracle"], err, { type: 65536, fatal: false });
|
|
422
424
|
}
|
|
423
425
|
});
|
|
424
|
-
})
|
|
425
|
-
parallel
|
|
426
|
+
})
|
|
426
427
|
}, outResult);
|
|
427
428
|
}
|
|
428
429
|
exports.executeBatchQuery = executeBatchQuery;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pi-r/oracle",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.8",
|
|
4
4
|
"description": "Oracle client driver for E-mc.",
|
|
5
5
|
"main": "client/index.js",
|
|
6
6
|
"types": "client/index.d.ts",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"homepage": "https://github.com/anpham6/pi-r#readme",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@e-mc/db": "^0.9.
|
|
25
|
-
"@e-mc/types": "^0.9.
|
|
24
|
+
"@e-mc/db": "^0.9.30",
|
|
25
|
+
"@e-mc/types": "^0.9.30",
|
|
26
26
|
"oracledb": "^6.6.0"
|
|
27
27
|
}
|
|
28
28
|
}
|
package/types/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
|
|
|
5
5
|
// @ts-ignore
|
|
6
6
|
import type { BindParameters, ConnectionAttributes, ExecuteOptions, InitialiseOptions, PoolAttributes } from 'oracledb';
|
|
7
7
|
|
|
8
|
-
export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, OracleCredential, string>, ExecuteAction<BindParameters> {
|
|
8
|
+
export interface OracleDataSource extends DbDataSource<string | object, ExecuteOptions, unknown, OracleCredential, string>, ExecuteAction<BindParameters> {
|
|
9
9
|
source: "oracle";
|
|
10
10
|
}
|
|
11
11
|
|