@sqb/oracle 4.20.2 → 4.20.3

package/cjs/ora-adapter.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OraAdapter = void 0;
 const tslib_1 = require("tslib");
 require("@sqb/oracle-dialect");
+const fs = tslib_1.__importStar(require("node:fs"));
+const os = tslib_1.__importStar(require("node:os"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const oracledb_1 = tslib_1.__importDefault(require("oracledb"));
 const helpers_js_1 = require("./helpers.js");
 const ora_connection_js_1 = require("./ora-connection.js");
@@ -15,6 +18,8 @@ class OraAdapter {
         // fetchAsString: [DataType.DATE, DataType.TIMESTAMP, DataType.TIMESTAMPTZ]
     };
     async connect(config) {
+        if (!config.driverOptions?.direct)
+            initOracleClient();
         const cfg = (0, helpers_js_1.clientConfigurationToDriver)(config);
         // Get oracle connection
         const connection = await oracledb_1.default.getConnection(cfg);
@@ -38,3 +43,22 @@ class OraAdapter {
     }
 }
 exports.OraAdapter = OraAdapter;
+let oracleClientInitialized = false;
+function initOracleClient() {
+    if (oracleClientInitialized)
+        return;
+    const libDirs = process.env.LD_LIBRARY_PATH || process.env.ORA_HOME;
+    if (libDirs) {
+        for (const libDir of libDirs.split(':')) {
+            if ((os.type() === 'Linux' &&
+                fs.existsSync(node_path_1.default.join(libDir, 'libclntsh.so'))) ||
+                (os.type() === 'Darwin' &&
+                    fs.existsSync(node_path_1.default.join(libDir, 'libclntsh.dylib'))) ||
+                (os.type() === 'Windows_NT' &&
+                    fs.existsSync(node_path_1.default.join(libDir, 'oci.dll')))) {
+                oracledb_1.default.initOracleClient({ libDir });
+                oracleClientInitialized = true;
+            }
+        }
+    }
+}

package/esm/ora-adapter.js

@@ -1,4 +1,7 @@
 import '@sqb/oracle-dialect';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import path from 'node:path';
 import oracledb from 'oracledb';
 import { clientConfigurationToDriver } from './helpers.js';
 import { OraConnection } from './ora-connection.js';
@@ -11,6 +14,8 @@ export class OraAdapter {
         // fetchAsString: [DataType.DATE, DataType.TIMESTAMP, DataType.TIMESTAMPTZ]
     };
     async connect(config) {
+        if (!config.driverOptions?.direct)
+            initOracleClient();
         const cfg = clientConfigurationToDriver(config);
         // Get oracle connection
         const connection = await oracledb.getConnection(cfg);
@@ -33,3 +38,22 @@ export class OraAdapter {
         }
     }
 }
+let oracleClientInitialized = false;
+function initOracleClient() {
+    if (oracleClientInitialized)
+        return;
+    const libDirs = process.env.LD_LIBRARY_PATH || process.env.ORA_HOME;
+    if (libDirs) {
+        for (const libDir of libDirs.split(':')) {
+            if ((os.type() === 'Linux' &&
+                fs.existsSync(path.join(libDir, 'libclntsh.so'))) ||
+                (os.type() === 'Darwin' &&
+                    fs.existsSync(path.join(libDir, 'libclntsh.dylib'))) ||
+                (os.type() === 'Windows_NT' &&
+                    fs.existsSync(path.join(libDir, 'oci.dll')))) {
+                oracledb.initOracleClient({ libDir });
+                oracleClientInitialized = true;
+            }
+        }
+    }
+}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@sqb/oracle",
   "description": "SQB serialization extension for Oracle database",
-  "version": "4.20.2",
+  "version": "4.20.3",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.20.2",
-    "@sqb/connect": "^4.20.2",
-    "@sqb/oracle-dialect": "^4.20.2",
+    "@sqb/builder": "^4.20.3",
+    "@sqb/connect": "^4.20.3",
+    "@sqb/oracle-dialect": "^4.20.3",
     "oracledb": ">= 6.4.0"
   },
   "type": "module",