@pi-r/oracle 0.2.8 → 0.3.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+Copyright 2023 Studio Trigger
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,6 +1,6 @@
 # @pi-r/oracle
 
-PEP 402 - Forever
+PEP 402 - Forever Aina
 
 ## LICENSE
 

package/client/index.d.ts

@@ -1,7 +1,7 @@
-import type { OracleDataSource } from '@e-mc/types/lib/db';
-
 import type { IDbSourceClient } from '@e-mc/db/types';
 
+import type { OracleDataSource } from '../types';
+
 declare const Oracle: IDbSourceClient<OracleDataSource>;
 
 export = Oracle;

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");
@@ -125,7 +126,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;
@@ -145,7 +145,7 @@ async function setCredential(item) {
                         credential.queueTimeout ?? (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);
@@ -166,7 +166,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);
@@ -227,7 +226,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;
@@ -298,7 +297,7 @@ 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) {
                     const rows = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.2.8",
+  "version": "0.3.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.5.4",
-    "@e-mc/types": "^0.5.4",
-    "oracledb": "^5.5.0"
+    "@e-mc/db": "^0.6.1",
+    "@e-mc/types": "^0.6.1",
+    "oracledb": "^6.3.0"
   }
 }