@pi-r/oracle 0.6.0 → 0.6.2

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/oracle
 
+https://e-mc.readthedocs.io/en/latest/db/oracle.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -56,8 +56,12 @@ function removePoolProperties(credential) {
     return credential;
 }
 function getPoolKey(credential) {
-    if (credential.connectString && (credential.user && credential.password || credential.externalAuth)) {
-        return credential.connectString + '_' + (credential.externalAuth ? 'external' : credential.user + '_' + credential.password) + '_' + (credential.edition || '') + '_' + (credential.tag ? credential.tag + '#' + (credential.matchAny ? '1' : '0') : '') + '_' + (credential.privilege ?? '') + '_' + (credential.configDir || '') + '_' + (credential.walletLocation || '') + '_' + (credential.sourceRoute || '') + '_' + Db.asString(credential.shardingKey, true) + '_' + Db.asString(credential.superShardingKey, true);
+    if (credential.connectString && (credential.user && credential.password || credential.externalAuth) || credential.poolAlias) {
+        if ('uuidKey' in credential) {
+            credential = { ...credential };
+            delete credential.uuidKey;
+        }
+        return JSON.stringify(credential);
     }
 }
 const useLibDir = () => process.platform === 'win32' || process.platform === 'darwin' && process.arch === 'x64';
@@ -157,10 +161,16 @@ async function setCredential(item) {
     }
     const poolAlias = credential.poolAlias;
     let password, pool;
-    if (typeof usePool === 'string' && (username = credential.user || poolAlias)) {
-        [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-        if (pool) {
-            pool.add(item, password);
+    if ((0, types_1.isString)(usePool)) {
+        if (username = credential.user || poolAlias) {
+            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
+            if (pool) {
+                pool.add(item, password);
+                return;
+            }
+        }
+        if (!password) {
+            item.usePool = '';
             return;
         }
     }
@@ -177,15 +187,6 @@ async function setCredential(item) {
             }
         }
     }
-    const poolKey = getPoolKey(credential);
-    if (!poolKey) {
-        item.usePool = false;
-        return;
-    }
-    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
-        pool.add(item);
-        return;
-    }
     const config = this.getPoolConfig("oracle" /* STRINGS.MODULE_NAME */, password);
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout } = config;
@@ -208,6 +209,11 @@ async function setCredential(item) {
             credential.connectTimeout ?? (credential.connectTimeout = idle / 1000);
         }
     }
+    const poolKey = getPoolKey(credential);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
     new OraclePool(await oracledb.createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;
@@ -315,10 +321,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
         const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("oracle" /* STRINGS.MODULE_NAME */, 'options', null, credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
-        const renewCache = ignoreCache === 0;
-        const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
+        const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         let queryString = '';
-        if ((caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache) && !streamRow) {
+        if (caching && ignoreCache !== true && !streamRow) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true) + Db.asString(clientOptions, true);
             if (ignoreCache !== 1) {
                 const result = this.getQueryResult(source, removePoolProperties(credential), queryString, cacheValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "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.8.0",
-    "@e-mc/types": "^0.8.0",
+    "@e-mc/db": "^0.8.2",
+    "@e-mc/types": "^0.8.2",
     "oracledb": "^6.3.0"
   }
 }

package/types/index.d.ts

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