@pi-r/oracle 0.2.13 → 0.2.15

package/client/index.js

@@ -169,9 +169,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         return [];
     }
     const db = require("oracledb");
-    let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
+    let parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
-        ({ parallel, connectOnce, errorQuery, sessionKey } = options);
+        ({ parallel, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
     }
     else {
         if (typeof options === 'string') {
@@ -302,7 +302,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 const executeOptions = { outFormat: db.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
                 commandType = this.commandType.SELECT;
-                if (streamRow) {
+                if (streamRow && (0, types_1.isString)(query)) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' && streamRow;
                     const stream = client.queryStream(query, params || [], executeOptions);
@@ -358,8 +358,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
     }
     return this.processRows(batch, tasks, {
-        disconnect: () => clients.forEach(item => item.close(err => err && this.writeFail(["Unable to close connnection", "oracle"], err, { type: 65536, fatal: false }))),
-        parallel
+        parallel,
+        errorAsEmpty,
+        disconnect: () => clients.forEach(item => item.close(err => err && this.writeFail(["Unable to close connnection", "oracle"], err, { type: 65536, fatal: false })))
     }, outResult);
 }
 exports.executeBatchQuery = executeBatchQuery;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.18",
-    "@e-mc/types": "^0.5.18",
+    "@e-mc/db": "^0.5.23",
+    "@e-mc/types": "^0.5.23",
     "oracledb": "^5.5.0"
   }
 }

package/types/index.d.ts

@@ -5,7 +5,7 @@ import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 // @ts-ignore
 import type { BindParameters, ConnectionAttributes, ExecuteOptions, PoolAttributes } from 'oracledb';
 
-export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, string | OracleCredential, string>, ExecuteAction<BindParameters> {
+export interface OracleDataSource extends DbDataSource<string | object, ExecuteOptions, unknown, string | OracleCredential, string>, ExecuteAction<BindParameters> {
     source: "oracle";
 }
 

package/client/pool.js

@@ -1,54 +0,0 @@
-"use strict";
-const DbPool = require('@e-mc/db/pool');
-const POOL_ACTIVE = new WeakSet();
-class OraclePool extends DbPool {
-    static CACHE_UNUSED = ['connectTimeout', 'transportConnectTimeout', 'expireTime', 'poolMax', 'poolMin', 'poolIncrement', 'poolTimeout', 'poolPingInterval', 'poolMaxPerShard', 'queueMax', 'queueRequests', 'queueTimeout', 'enableStatistics', 'sodaMetaDataCache', 'stmtCacheSize', 'httpsProxy', 'httpsProxyPort'];
-    static CACHE_IGNORE = ['sessionCallback'];
-    static asString(credential) {
-        if (credential.connectString && (credential.user && credential.password || credential.externalAuth) || credential.poolAlias) {
-            return JSON.stringify(this.removeUUIDKey(credential));
-        }
-        return super.asString(credential);
-    }
-    static sanitize(credential) {
-        if (!this.canCache(credential)) {
-            return;
-        }
-        if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
-            return credential;
-        }
-        return super.sanitize(credential);
-    }
-    get closeable() {
-        return super.closeable || this.client.status === 6001;
-    }
-    async getConnection(credential) {
-        if (credential) {
-            POOL_ACTIVE.add(credential);
-        }
-        return this.client.getConnection();
-    }
-    async close() {
-        return this.client.close();
-    }
-    isEmpty() {
-        if (this.closed) {
-            return true;
-        }
-        try {
-            const data = this.client.getStatistics();
-            if (data) {
-                const { connectionsInUse, currentQueueLength } = data;
-                return connectionsInUse === 0 && currentQueueLength === 0;
-            }
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
-    get closed() {
-        return this.client.status === 6002;
-    }
-}
-module.exports = OraclePool;