@pi-r/oracle 0.3.6 → 0.3.8

package/client/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = void 0;
+const oracledb = require("oracledb");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -127,7 +128,6 @@ async function setCredential(item) {
         const poolKey = getPoolKey(credential);
         if (poolKey) {
             if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-                const { createPool } = require("oracledb");
                 const config = this.getPoolConfig("oracle", password);
                 if (config) {
                     const { min, max, idle, queue_max, queue_idle } = config;
@@ -147,7 +147,7 @@ async function setCredential(item) {
                         (_e = credential.queueTimeout) !== null && _e !== void 0 ? _e : (credential.queueTimeout = queue_idle);
                     }
                 }
-                new OraclePool(await createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+                new OraclePool(await oracledb.createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
             }
             else {
                 pool.add(item);
@@ -168,7 +168,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("oracledb");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey } = options);
@@ -229,7 +228,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 pool.connected = false;
             }
         }
-        clients.push(client || (client = await db.getConnection((oracleCredential || credential))));
+        clients.push(client || (client = await oracledb.getConnection((oracleCredential || credential))));
         if (connectOnce) {
             if (!parallel) {
                 oracleClient = client;
@@ -300,9 +299,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 if (oracleClient && parallel) {
                     oracleClient = undefined;
                 }
-                const executeOptions = { outFormat: db.OUT_FORMAT_OBJECT, ...clientOptions, resultSet: false, autoCommit: true };
+                const executeOptions = { outFormat: oracledb.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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "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.6.16",
-    "@e-mc/types": "^0.6.16",
+    "@e-mc/db": "^0.6.19",
+    "@e-mc/types": "^0.6.19",
     "oracledb": "^6.5.1"
   }
 }

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;