linkam-db 1.1.1 → 1.1.2

package/README.md

@@ -58,8 +58,12 @@ Example: `C:\Users\username\AppData\Local\Temp\linkam-db-oracle-client\instantcl
 const db = require('linkam-db');
 
 async function example() {
+    // Initialize with default db.ini location
     const knex = await db.init('myDatabase');
     
+    // Or specify custom credentials file path
+    const knex2 = await db.init('myDatabase', '/path/to/custom/credentials.ini');
+    
     // Run raw SQL query
     const results = await knex.raw('SELECT * FROM my_table WHERE id = ?', [123]);
     
@@ -79,3 +83,5 @@ username = your_username
 password = your_password
 connectString = hostname:port/servicename
 ```
+
+By default, linkam-db looks for `personal.db.ini` first, then falls back to `db.ini` in your project root. You can also specify a custom credentials file path as the second parameter to `db.init()`.

package/authorize.js

@@ -2,10 +2,10 @@ const log = require(`linkam-logs`)
 const path = require(`path`)
 const fs = require(`fs`)
 const propReader = require('properties-reader')
-const props = propReader(getPropFile()).getAllProperties()
 
-function getCredentials(app) {
+function getCredentials(app, credentialsFile) {
     log.debug(`getCredentials called.  app=${app}`)
+    const props = propReader(getPropFile(credentialsFile)).getAllProperties()
     let credentials = props
     if (credentials) {
         return credentials
@@ -14,7 +14,18 @@ function getCredentials(app) {
     }
 }
 
-function getPropFile() {
+function getPropFile(credentialsFile) {
+    if (credentialsFile) {
+        // Use provided credentials file path
+        if (fs.existsSync(credentialsFile)) {
+            return credentialsFile
+        } else {
+            log.error(`Provided credentials file does not exist: ${credentialsFile}`)
+            throw new Error(`Credentials file not found: ${credentialsFile}`)
+        }
+    }
+    
+    // Default behavior: look for personal.db.ini, then db.ini
     let criteria = path.join(__dirname, `..`, `..`, `db.ini`)
     let personal = path.join(__dirname, `..`, `..`, `personal.db.ini`)
     let propFile = fs.existsSync(personal) ? personal : criteria

package/index.js

@@ -4,67 +4,15 @@ const fs = require(`fs`)
 const camelcase = require(`./camelcase`)
 const authorize = require(`./authorize`)
 const log = require(`linkam-logs`)
+const oracleClientSetup = require(`./oracleClientSetup`)
 
-// Handle pkg executable - extract Oracle Client to real filesystem
-let libDir
-if (process.pkg) {
-    // When running in pkg, extract DLLs to temp directory
-    // Windows DLL loader can't load from pkg's virtual filesystem
-    const os = require('os')
-    const tempDir = path.join(os.tmpdir(), 'linkam-db-oracle-client', 'instantclient_12_1')
-    
-    // Extract DLLs if not already present
-    if (!fs.existsSync(tempDir)) {
-        log.info('Extracting Oracle Client libraries to temp directory...')
-        fs.mkdirSync(tempDir, { recursive: true })
-        
-        const sourceDir = path.resolve(__dirname, 'instantclient_12_1')
-        const files = fs.readdirSync(sourceDir)
-        
-        files.forEach(file => {
-            const sourcePath = path.join(sourceDir, file)
-            const targetPath = path.join(tempDir, file)
-            
-            const stats = fs.statSync(sourcePath)
-            if (stats.isDirectory()) {
-                // Copy directory recursively
-                copyDirSync(sourcePath, targetPath)
-            } else {
-                fs.copyFileSync(sourcePath, targetPath)
-            }
-        })
-        log.info(`Oracle Client extracted to: ${tempDir}`)
-    }
-    
-    libDir = tempDir
-} else {
-    // Normal execution - use __dirname
-    libDir = path.resolve(__dirname, `instantclient_12_1`)
-}
-
-// Helper function to copy directory recursively
-function copyDirSync(source, target) {
-    if (!fs.existsSync(target)) {
-        fs.mkdirSync(target, { recursive: true })
-    }
-    const files = fs.readdirSync(source)
-    files.forEach(file => {
-        const sourcePath = path.join(source, file)
-        const targetPath = path.join(target, file)
-        const stats = fs.statSync(sourcePath)
-        if (stats.isDirectory()) {
-            copyDirSync(sourcePath, targetPath)
-        } else {
-            fs.copyFileSync(sourcePath, targetPath)
-        }
-    })
-}
-
+// Initialize Oracle Client with the appropriate library directory
+const libDir = oracleClientSetup.getOracleClientPath()
 oracledb.initOracleClient({ libDir: libDir })
 
 
-async function init(db) {
-    let creds = authorize.getCredentials(db)
+async function init(db, credentialsFile) {
+    let creds = authorize.getCredentials(db, credentialsFile)
     let credentials = {
         client: creds[`${db}.client`],
         user: creds[`${db}.username`],

package/oracleClientSetup.js

@@ -0,0 +1,70 @@
+const path = require('path')
+const fs = require('fs')
+const log = require('linkam-logs')
+
+/**
+ * Helper function to copy directory recursively
+ */
+function copyDirSync(source, target) {
+    if (!fs.existsSync(target)) {
+        fs.mkdirSync(target, { recursive: true })
+    }
+    const files = fs.readdirSync(source)
+    files.forEach(file => {
+        const sourcePath = path.join(source, file)
+        const targetPath = path.join(target, file)
+        const stats = fs.statSync(sourcePath)
+        if (stats.isDirectory()) {
+            copyDirSync(sourcePath, targetPath)
+        } else {
+            fs.copyFileSync(sourcePath, targetPath)
+        }
+    })
+}
+
+/**
+ * Determines the Oracle Client library directory path.
+ * When running in a PKG executable, extracts DLLs to the system temp directory
+ * because Windows DLL loader cannot load from PKG's virtual filesystem.
+ * 
+ * @returns {string} The path to the Oracle Instant Client libraries
+ */
+function getOracleClientPath() {
+    if (process.pkg) {
+        // When running in pkg, extract DLLs to temp directory
+        // Windows DLL loader can't load from pkg's virtual filesystem
+        const os = require('os')
+        const tempDir = path.join(os.tmpdir(), 'linkam-db-oracle-client', 'instantclient_12_1')
+        
+        // Extract DLLs if not already present
+        if (!fs.existsSync(tempDir)) {
+            log.info('Extracting Oracle Client libraries to temp directory...')
+            fs.mkdirSync(tempDir, { recursive: true })
+            
+            const sourceDir = path.resolve(__dirname, 'instantclient_12_1')
+            const files = fs.readdirSync(sourceDir)
+            
+            files.forEach(file => {
+                const sourcePath = path.join(sourceDir, file)
+                const targetPath = path.join(tempDir, file)
+                
+                const stats = fs.statSync(sourcePath)
+                if (stats.isDirectory()) {
+                    copyDirSync(sourcePath, targetPath)
+                } else {
+                    fs.copyFileSync(sourcePath, targetPath)
+                }
+            })
+            log.info(`Oracle Client extracted to: ${tempDir}`)
+        }
+        
+        return tempDir
+    } else {
+        // Normal execution - use __dirname
+        return path.resolve(__dirname, 'instantclient_12_1')
+    }
+}
+
+module.exports = {
+    getOracleClientPath
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkam-db",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "main": "index.js",
   "scripts": {