@pi-r/oracle 0.12.1 → 0.12.3

package/client/index.js

@@ -199,6 +199,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         outResult ||= new Array(length);
     }
     const caching = this.hasCache("oracle", sessionKey);
+    const sortKeys = this.settingsOf("oracle", 'cache', 'sort_keys') === true;
     const tasks = new Array(length);
     const clients = [];
     let oraclePool, oracleClient, oracleCredential, onceCredential = connectOnce ? batch[0].credential : undefined;
@@ -269,11 +270,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState = 1;
         const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle", 'options', credential) && asFunction(item.streamRow) : item.streamRow;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
-        let queryString = '';
+        let queryString = '', cacheCredential;
         if (caching && ignoreCache !== true && !streamRow) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true) + Db.asString(clientOptions, true);
+            cacheCredential = DbPool.sanitize(credential, sortKeys);
             if (ignoreCache !== 1) {
-                const result = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue);
+                const result = this.getQueryResult(source, cacheCredential, queryString, cacheValue);
                 if (result) {
                     if (parallel) {
                         tasks[i] = Promise.resolve(result);
@@ -308,7 +310,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 const executeOptions = { outFormat: oracledb.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
                 commandType = this.commandType.SELECT;
-                if (streamRow) {
+                if (streamRow && isString(query)) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' ? streamRow : null;
                     const stream = client.queryStream(query, params || [], executeOptions);
@@ -333,7 +335,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                         else {
                             this.add(item, 4);
-                            resolve(!error ? this.setQueryResult(source, DbPool.sanitize(credential), queryString, rows, cacheValue) : rows);
+                            resolve(!error ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : rows);
                         }
                     })
                         .on('end', () => stream.destroy());
@@ -341,7 +343,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 else {
                     const { rows } = await client.execute(query, params || [], executeOptions);
                     this.add(item, 4);
-                    resolve(rows ? this.setQueryResult(source, DbPool.sanitize(credential), queryString, rows, cacheValue) : null);
+                    resolve(rows ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : null);
                 }
             }
             catch (err) {

package/client/pool.js

@@ -11,14 +11,14 @@ class OraclePool extends DbPool {
         }
         return super.asString(credential);
     }
-    static sanitize(credential) {
+    static sanitize(credential, sort) {
         if (!this.canCache(credential)) {
             return;
         }
         if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
             return credential;
         }
-        return super.sanitize(credential);
+        return super.sanitize(credential, sort);
     }
     get closeable() {
         return super.closeable || this.client.status === 6001;

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/pi-r.git",
@@ -20,8 +17,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.14.0",
-    "@e-mc/types": "^0.14.0",
+    "@e-mc/db": "^0.14.4",
+    "@e-mc/types": "^0.14.4",
     "oracledb": "^6.10.0"
   }
 }

package/types/index.d.ts

@@ -13,7 +13,7 @@ export const enum POOL_STATUS {
     RECONFIGURING = 6003
 }
 
-export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, OracleCredential, string>, ExecuteAction<BindParameters> {
+export interface OracleDataSource extends DbDataSource<string | object, ExecuteOptions, unknown, OracleCredential, string>, ExecuteAction<BindParameters> {
     source: "oracle";
 }