oracledb 6.7.0 → 6.7.1

package/lib/thin/sqlnet/paramParser.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -26,7 +26,7 @@
 
 'use strict';
 
-const {createNVPair, findValue} = require("./nvStrToNvPair.js");
+const {createNVPair} = require("./nvStrToNvPair.js");
 const fs = require('fs');
 const process = require('process');
 const readline = require('readline');
@@ -59,12 +59,21 @@ function tnsnamesFilePath(configDir) {
     return filePathVal;
   }
 }
+//Structure for each tnsnames.ora file
+class tnsnamesElement {
 
+  constructor() {
+    this.readInProgress = false;
+    this.waiters = [];
+    this.aliasht = new Map(); // It will have key as alias and value as its aliases value
+    this.modTime = new Map(); // It will have tnsnames filename and also all its ifile and its modified time
+  }
+}
 class NLParamParser {
 
   constructor() {
-    this.waiters = [];
-    this.readInProgress = false;
+  // key as tnsnames.ora(file_name) and value will be tnsnamesStruct<ht(alias key and value), modTime>
+    this.tnsnamesHT = new Map();
   }
   /**
  * Reads the given file line by line and stores the
@@ -73,29 +82,35 @@ class NLParamParser {
  * @returns {Promise}
  */
   async initializeNlpa(file_path) {
-    if (this.readInProgress) {
+    let tnsFileStruct;
+    if (this.tnsnamesHT.has(file_path))
+      tnsFileStruct = this.tnsnamesHT.get(file_path);
+    else
+      tnsFileStruct = new tnsnamesElement();
+    if (tnsFileStruct.readInProgress) {
       await new Promise((resolve) => {
-        this.waiters.push(resolve);
+        tnsFileStruct.waiters.push(resolve);
       });
     }
-    if (!this.checkModfTime()) {
+    /* check modification time of all files in the cache
+       including the file_path */
+    if (!this.checkModfTime(tnsFileStruct)) {
       /* No File has been modified */
-      return this.ht;
+      return tnsFileStruct.aliasht;
     }
-    this.ht = new Map();
-    this.modTime = new Map(); //stores modified time of each IFile
-    this.readInProgress = true;
-    await this.start(file_path, 0); //start with 0 depth (tnsnames.ora)
-    return this.ht;
+    tnsFileStruct.readInProgress = true;
+    await this.start(file_path, 0, tnsFileStruct); //start with 0 depth (tnsnames.ora)
+    this.tnsnamesHT.set(file_path, tnsFileStruct);
+    return tnsFileStruct.aliasht;
   }
 
-  async start(file_path, depth) {
+  async start(file_path, depth, tnsFileStruct) {
 
     if (depth > MAX_IFILE_DEPTH)
       return; //ignore after max depth
     const stat = fs.statSync(file_path);
     // store file path and its modified time.
-    this.modTime.set(file_path, stat.mtime);
+    tnsFileStruct.modTime.set(file_path, stat.mtime);
     // Creating a readable stream from file
     // readline module reads line by line
     // but from a readable stream only.
@@ -129,7 +144,7 @@ class NLParamParser {
           nvElem = nvElem + line;
 
         } else if (nvElem.length != 0) {
-          await this.addNLPListElement(nvElem, depth); // Add Parameter to Hashtable
+          await this.addNLPListElement(nvElem, depth, tnsFileStruct); // Add Parameter to Hashtable
           nvElem = ""; // Clear first, before storing current line
 
           line = this.checkNLPforComments(line);
@@ -138,12 +153,12 @@ class NLParamParser {
       }
     }
     if (nvElem.length != 0) { // at eof, still one more parameter to read
-      await this.addNLPListElement(nvElem, depth);
+      await this.addNLPListElement(nvElem, depth, tnsFileStruct);
       nvElem = "";      // clear nvElem buffer after added
     }
-    this.readInProgress = false;
+    tnsFileStruct.readInProgress = false;
     let waiter;
-    while ((waiter = this.waiters.pop())) {
+    while ((waiter = tnsFileStruct.waiters.pop())) {
       waiter();
     }
   }
@@ -173,9 +188,11 @@ class NLParamParser {
     return str1.join('');
   }
   // check if any of the IFiles has been changed
-  checkModfTime() {
-    if (this.modTime) {
-      for (const [key, value] of this.modTime) {
+  checkModfTime(tnsFileStruct) {
+    // There may be multiple tnsnames.ora files. So check if the tnsnames.ora
+    // in question is already cached
+    if (tnsFileStruct.modTime.size != 0) {
+      for (const [key, value] of tnsFileStruct.modTime) {
         if (fs.existsSync(key)) {
           const stat = fs.statSync(key);
           if ((stat.mtime - value > 0)) {
@@ -193,7 +210,7 @@ class NLParamParser {
     * adds name value pairs from the input buffer into the hash table.
     * @param {string} ibuf
     */
-  async addNLPListElement(ibuf, depth) {
+  async addNLPListElement(ibuf, depth, tnsFileStruct) {
     const res = ibuf.split(/\r?\n/).filter(element => element);
     for (let i = 0; i < res.length; i++) {
       if (res[i].charAt(0) != '(') {
@@ -205,33 +222,15 @@ class NLParamParser {
       nvp.name = uname;
       // support for ifile
       if (uname == 'IFILE') {
-        await this.start(nvp.atom, depth + 1);
+        await this.start(nvp.atom, depth + 1, tnsFileStruct);
       } else {
         const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
         for (let i = 0; i < unames.length; i++) {
-          this.ht.set(unames[i], nvp);
+          tnsFileStruct.aliasht.set(unames[i], nvp);
         }
       }
     }
   }
-  toString() {
-    let out = "";
-    this.ht.forEach((value) => {
-      out = out + value.toString() + "\n";
-    });
-    return out;
-  }
-  /**
-    * if key is address/port then it returns the port value from the
-    * address NVPAIR.
-    * @param {string} key
-    * @returns {string}
-   */
-  findValueOf(key) {
-    const myarr = key.split('/');
-    return (findValue(this.ht.get(myarr[0].toUpperCase()), myarr));
-  }
-
 }
 
 module.exports = {

package/lib/util.js

@@ -171,9 +171,7 @@ function traceExitFn(traceContext, result, err) {
   }
 
   // Fill the traceContext.
-  if (err) {
-    traceContext.error = Object.assign(({}, err));
-  }
+  traceContext.error = err;
   traceContext.additionalConfig.result = result;
   if (this._impl) {
     // fill function call state.

package/lib/version.js

@@ -31,6 +31,6 @@
 module.exports = {
   VERSION_MAJOR: 6,
   VERSION_MINOR: 7,
-  VERSION_PATCH: 0,
+  VERSION_PATCH: 1,
   VERSION_SUFFIX: ''
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "description": "A Node.js module for Oracle Database access from JavaScript and TypeScript",
   "license": "(Apache-2.0 OR UPL-1.0)",
   "homepage": "http://oracle.github.io/node-oracledb/",

package/build/Release/oracledb-6.7.0-darwin-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-darwin-arm64.node v22.2.0 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 06:28:34 GMT

package/build/Release/oracledb-6.7.0-darwin-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-darwin-x64.node v20.11.1 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 06:21:29 GMT

package/build/Release/oracledb-6.7.0-js-buildinfo.txt

@@ -1 +0,0 @@
-29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492

package/build/Release/oracledb-6.7.0-linux-arm64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-linux-arm64.node v18.20.4 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 16:48:12 GMT

package/build/Release/oracledb-6.7.0-linux-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-linux-x64.node v16.20.2 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 16:47:47 GMT

package/build/Release/oracledb-6.7.0-win32-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.7.0-win32-x64.node v18.16.0 29e0b9cfc2f22f3df1e6b746323fb5f1f95ba492 3f4e00888d20e313374cfe0fb148de2180eaf93f Thu, 07 Nov 2024 16:23:47 GMT

package/examples/README.md

@@ -1,140 +0,0 @@
-# Node-oracledb Examples
-
-The directory in node-oracledb's [Github repository](https://github.com/oracle/node-oracledb/tree/main/examples) contains a lot of [node-oracledb](https://www.npmjs.com/package/oracledb) examples.
-Documentation is [here](https://node-oracledb.readthedocs.io/en/latest/).
-
-To run the examples:
-
-- [Install node-oracledb](https://node-oracledb.readthedocs.io/en/latest/user_guide/installation.html#quickstart).
-
-- Ensure that you navigate to the `examples` directory in your terminal window
-  or IDE, where you are running the samples.
-
-- Review `dbconfig.js`.
-
-In your terminal window or IDE, set the following environment variables to
-provide credentials for the `dbconfig.js` file.
-
-- `NODE_ORACLEDB_USER` must be set to the database user.
-
-- `NODE_ORACLEDB_PASSWORD` must be set to the database password.
-
-- `NODE_ORACLEDB_CONNECTIONSTRING` must be set to the connection string that points to your database's location.
-
-- `NODE_ORACLEDB_EXTERNALAUTH` provides the options for enabling external authentication. Setting this environment variable to "true" will enable external authentication. To ensure external authentication works, firstly make sure the Oracle external authentication service is correctly configured. See [Documentation for External Authentication](https://node-oracledb.readthedocs.io/en/latest/user_guide/connection_handling.html#extauth) for details.
-
-- `NODE_ORACLEDB_DRIVER_MODE` provides an option to set the 'Thin' or 'Thick' modes of node-oracledb. Setting this environment variable to "thick" will enable Thick mode.
-Setting it to "thin" will retain the Thin mode. The default mode is Thin.
-
-- `NODE_ORACLEDB_WALLET_LOCATION` must be set to the local directory name for the wallets that may be required for mutual TLS (mTLS) connections, especially to Oracle Cloud
-Autonomous Databases optionally. The wallet location can also be provided as a part of the database connect string.
-
-- `NODE_ORACLEDB_WALLET_PASSWORD` must set to the password for the wallets that may be required for mutual TLS (mTLS) connections, especially to Oracle Cloud Autonomous Databases.
-
-- `NODE_ORACLEDB_CLIENT_LIB_DIR` provides an optional path for the Oracle Client libraries to be used on Windows and macOS platforms, when using Thick mode in node-oracledb.
-
-Review the examples and then run them individually.  For example, to see what
-  the file `example.js` does, use:
-
-  ```
-  node example.js
-  ```
-
-After running the examples, the demonstration objects can be dropped with
-  `demodrop.js`:
-
-  ```
-  node demodrop.js
-  ```
-
-Many examples can be run in either node-oracledb Thin (the default) or Thick
-modes.  Thin mode is a pure JavaScript implementation of node-oracledb.
-Setting the environment variable `NODE_ORACLEDB_DRIVER_MODE` to `'thick'` will
-make examples use Thick mode.
-
-## Example Overview
-
-If this is your first time with node-oracledb, start with
-[`example.js`](example.js).
-
-File Name                                                 | Description
-----------------------------------------------------------|----------------------------------------------------------------------------------
-[`aqmulti.js`](aqmulti.js)                                | Oracle Advanced Queuing (AQ) example passing multiple messages
-[`aqobject.js`](aqobject.js)                              | Oracle Advanced Queuing (AQ) example passing an Oracle Database object
-[`aqoptions.js`](aqoptions.js)                            | Oracle Advanced Queuing (AQ) example setting options and message attributes
-[`aqraw.js`](aqraw.js)                                    | Basic Oracle Advanced Queuing (AQ) example passing text messages
-[`aqutil.js`](aqutil.js)                                  | Common file to setup the user credentials for all the Advanced Queuing (AQ) examples.
-[`blobhttp.js`](blobhttp.js)                              | Simple web app that streams an image
-[`azureConfigProvider.js`](azureConfigProvider.js)        | Show how to connect to an Oracle Database using Azure Configuration Providers
-[`calltimeout.js`](calltimeout.js)                        | Shows how to cancel a SQL statement if it doesn't complete in a specified time
-[`connect.js`](connect.js)                                | Basic example for creating a standalone (non-pooled) connection
-[`connectionpool.js`](connectionpool.js)                  | Basic example creating a pool of connections
-[`cqn1.js`](cqn1.js)                                      | Basic Continuous Query Notification (CQN) example
-[`cqn2.js`](cqn2.js)                                      | Continuous Query Notification with notification grouping
-[`date_timestamp1.js`](date_timestamp1.js)                | Show some basic DATE and TIMESTAMP behaviors
-[`date_timestamp2.js`](date_timestamp2.js)                | Show some DATE and TIMESTAMP behaviors with timezones
-[`dbconfig.js`](dbconfig.js)                              | Common file used by examples for setting connection credentials
-[`dbmsoutputgetline.js`](dbmsoutputgetline.js)            | Show fetching DBMS_OUTPUT by binding buffers
-[`dbmsoutputpipe.js`](dbmsoutputpipe.js)                  | Show fetching DBMS_OUTPUT by using a pipelined table
-[`demodrop.js`](demodrop.js)                              | Drops the schema objects created by the examples
-[`demosetup.js`](demosetup.js)                            | Used to create common schema objects for the examples
-[`dmlrupd.js`](dmlrupd.js)                                | Example of DML RETURNING where multiple rows are matched
-[`em_batcherrors.js`](em_batcherrors.js)                  | `executeMany()` example showing handling data errors
-[`em_dmlreturn1.js`](em_dmlreturn1.js)                    | `executeMany()` example of DML RETURNING that returns single values
-[`em_dmlreturn2.js`](em_dmlreturn2.js)                    | `executeMany()` example of DML RETURNING that returns multiple values
-[`em_insert1.js`](em_insert1.js)                          | Array DML example using `executeMany()` with bind-by-name syntax
-[`em_insert2.js`](em_insert2.js)                          | Array DML example using `executeMany()` with bind by position
-[`em_plsql.js`](em_plsql.js)                              | `executeMany()` example calling PL/SQL multiple times with one call
-[`em_rowcounts.js`](em_rowcounts.js)                      | `executeMany()` example showing how to find the number of rows affected by each input row
-[`endtoend.js`](endtoend.js)                              | Example showing setting tracing attributes
-[`example.js`](example.js)                                | Basic example showing creating a table, inserting multiple rows, and querying rows
-[`impres.js`](impres.js)                                  | Shows PL/SQL 'Implict Results' returning multiple query results from PL/SQL code.
-[`insert1.js`](insert1.js)                                | Basic example creating a table and inserting data.  Shows DDL and DML
-[`insert2.js`](insert2.js)                                | Basic example showing auto commit behavior
-[`lastinsertid.js`](lastinsertid.js)                      | Shows inserting a row and getting its ROWID.
-[`lobbinds.js`](lobbinds.js)                              | Demonstrates how to bind and query LOBs
-[`lobinsert1.js`](lobinsert1.js)                          | Shows inserting a file into a CLOB column
-[`lobinsert2.js`](lobinsert2.js)                          | Inserts text into a CLOB column using the RETURNING INTO method.
-[`lobinserttemp.js`](lobinserttemp.js)                    | Writes data to a Temporary CLOB and then inserts it into the database
-[`lobplsqltemp.js`](lobplsqltemp.js)                      | Streams data into a Temporary CLOB and then passes it to PL/SQL
-[`lobselect.js`](lobselect.js)                            | Shows basic, non-streaming CLOB and BLOB queries
-[`lobstream1.js`](lobstream1.js)                          | Shows how to stream LOBs to files
-[`lobstream2.js`](lobstream2.js)                          | Shows using Stream data events to fetch a CLOB
-[`lowercasecolumns.js`](lowercasecolumns.js)              | Shows how a type handler can convert column names to lower case
-[`metadata.js`](metadata.js)                              | Shows the metadata available after executing SELECT statements
-[`ociConfigProvider.js`](ociConfigProvider.js)            | Show how to connect to an Oracle Database using OCI Configuration Providers
-[`plsqlarray.js`](plsqlarray.js)                          | Examples of binding PL/SQL "INDEX BY" tables
-[`plsqlfunc.js`](plsqlfunc.js)                            | How to call a PL/SQL function
-[`plsqlproc.js`](plsqlproc.js)                            | How to call a PL/SQL procedure
-[`plsqlrecord.js`](plsqlrecord.js)                        | Shows binding of PL/SQL RECORDS
-[`plsqlvarrayrecord.js`](plsqlvarrayrecord.js)            | Shows binding a VARRAY of RECORD in PL/SQL
-[`plsqlrowtype.js`](plsqlrowtype.js)                      | Shows binding of PL/SQL %ROWTYPE object
-[`raw.js`](raw.js)                                        | Shows using a Buffer to insert and select a RAW
-[`refcursor.js`](refcursor.js)                            | Shows using a ResultSet to fetch rows from a REF CURSOR
-[`refcursortoquerystream.js`](refcursortoquerystream.js)  | Converts a REF CURSOR returned from `execute()` to a query stream.
-[`resultset1.js`](resultset1.js)                          | Executes a query and uses a ResultSet to fetch rows with `getRow()`
-[`resultset2.js`](resultset2.js)                          | Executes a query and uses a ResultSet to fetch batches of rows with `getRows()`
-[`resultsettoquerystream.js`](resultsettoquerystream.js)  | Converts a ResultSet returned from `execute()` into a Readable Stream.
-[`rowlimit.js`](rowlimit.js)                              | Shows ways to limit the number of records fetched by queries
-[`sampleazuretokenauth.js`](sampleazuretokenauth.js)      | Shows connection pooling with Azure token based authentication.
-[`sampleocitokenauth.js`](sampleocitokenauth.js)          | Shows connection pooling with OCI OAuth 2.0 token based authentication.
-[`select1.js`](select1.js)                                | Executes a basic query without using a connection pool or ResultSet
-[`select2.js`](select2.js)                                | Executes queries to show array and object output formats
-[`selectgeometry.js`](selectgeometry.js)                  | Insert and query Oracle Spatial geometries
-[`selectjson.js`](selectjson.js)                          | Shows some JSON features of Oracle Database 21c
-[`selectjsonblob.js`](selectjsonblob.js)                  | Shows how to use a BLOB as a JSON column store
-[`selectobject.js`](selectobject.js)                      | Insert and query a named Oracle database object
-[`selectnestedcursor.js`](selectnestedcursor.js)          | Shows selecting from a nested cursor
-[`selectstream.js`](selectstream.js)                      | Executes a basic query using a Readable Stream
-[`selectvarray.js`](selectvarray.js)                      | Shows inserting and selecting from a VARRAY column
-[`sessionfixup.js`](sessionfixup.js)                      | Shows a pooled connection callback to efficiently set session state
-[`sessiontagging1.js`](sessiontagging1.js)                | Simple pooled connection tagging for setting session state
-[`sessiontagging2.js`](sessiontagging2.js)                | More complex example of pooled connection tagging for setting session state
-[`soda1.js`](soda1.js)                                    | Basic Simple Oracle Document Access (SODA) example
-[`typehandlerdate.js`](typehandlerdate.js)                | Show how a type handler can format a queried date in a locale-specific way
-[`typehandlernum.js`](typehandlernum.js)                  | Show how a type handler can alter queried numbers
-[`vectortype1.js`](vectortype1.js)                        | Insert and query VECTOR columns.
-[`vectortype2.js`](vectortype2.js)                        | Insert data into VECTOR columns and verify vector operations.
-[`version.js`](version.js)                                | Shows the node-oracledb version attributes
-[`webapp.js`](webapp.js)                                  | A simple web application using a connection pool
-[`xmltypeInDbObject.js`](xmltypeInDbObject.js)            | Work with XMLType data in DbObject (Thin mode only)