oracledb 6.5.0 → 6.6.0

package/lib/thin/sqlnet/paramParser.js

@@ -32,6 +32,7 @@ const process = require('process');
 const readline = require('readline');
 const errors = require("../../errors.js");
 
+const MAX_IFILE_DEPTH = 4;
 /**
  * Returns File path of the tnsnames.ora if it exists.
  */
@@ -59,9 +60,12 @@ function tnsnamesFilePath(configDir) {
   }
 }
 
-let prevmtime = 0;
-
 class NLParamParser {
+
+  constructor() {
+    this.waiters = [];
+    this.readInProgress = false;
+  }
   /**
  * Reads the given file line by line and stores the
  * network service names mapped to connect descriptors in the hashtable.
@@ -69,13 +73,29 @@ class NLParamParser {
  * @returns {Promise}
  */
   async initializeNlpa(file_path) {
-    const stat = fs.statSync(file_path);
-
-    if (!(stat.mtime - prevmtime)) {
-      /* File has been read */
+    if (this.readInProgress) {
+      await new Promise((resolve) => {
+        this.waiters.push(resolve);
+      });
+    }
+    if (!this.checkModfTime()) {
+      /* No File has been modified */
       return this.ht;
     }
+    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;
+  }
+
+  async start(file_path, depth) {
 
+    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);
     // Creating a readable stream from file
     // readline module reads line by line
     // but from a readable stream only.
@@ -84,52 +104,49 @@ class NLParamParser {
       output: process.stdout,
       terminal: false
     });
-    this.ht = new Map();
-
-    const start = async () =>{
-      let nvElem = "";
-      for await (let line of file) {
-        if (line.length == 0) {   // ignore empty lines
-          continue;
-        } else if (line[0] == '#') {  // comment line
+    let nvElem = "";
+    for await (let line of file) {
+      if (line.length == 0) {   // ignore empty lines
+        continue;
+      } else if (line[0] == '#') {  // comment line
+        continue;
+      } else if ((line[0] == ' ') ||    // continued input on new line
+                  (line[0] == '\t') ||
+                  (line[0] == ')') ||
+                  (line[0] == '(')) {
+        line = line.replace(/\s+/g, '');
+        line = this.checkNLPforComments(line);
+        if (line.length == 0)
           continue;
-        } else if ((line[0] == ' ') ||    // continued input on new line
-                    (line[0] == '\t') ||
-                    (line[0] == ')') ||
-                    (line[0] == '(')) {
-          line = line.replace(/\s+/g, '');
-          line = this.checkNLPforComments(line);
-          if (line.length == 0)
-            continue;
-          else {
-            nvElem = nvElem + line;
-          }
+        else {
+          nvElem = nvElem + line;
+        }
 
-        } else {  // new NV Element starting here
-          if (nvElem.length == 0) {
+      } else {  // new NV Element starting here
+        if (nvElem.length == 0) {
 
-            line = this.checkNLPforComments(line);
-            nvElem = nvElem + line;
+          line = this.checkNLPforComments(line);
+          nvElem = nvElem + line;
 
-          } else if (nvElem.length != 0) {
-            this.addNLPListElement(nvElem); // Add Parameter to Hashtable
-            nvElem = ""; // Clear first, before storing current line
+        } else if (nvElem.length != 0) {
+          await this.addNLPListElement(nvElem, depth); // Add Parameter to Hashtable
+          nvElem = ""; // Clear first, before storing current line
 
-            line = this.checkNLPforComments(line);
-            nvElem = nvElem + line;
-          }
+          line = this.checkNLPforComments(line);
+          nvElem = nvElem + line;
         }
       }
-      if (nvElem.length != 0) { // at eof, still one more parameter to read
-        this.addNLPListElement(nvElem);
-        nvElem = "";      // clear nvElem buffer after added
-      }
-      prevmtime = stat.mtime;
-      return this.ht;
-    };
-    return await start();
+    }
+    if (nvElem.length != 0) { // at eof, still one more parameter to read
+      await this.addNLPListElement(nvElem, depth);
+      nvElem = "";      // clear nvElem buffer after added
+    }
+    this.readInProgress = false;
+    let waiter;
+    while ((waiter = this.waiters.pop())) {
+      waiter();
+    }
   }
-
   /**
    * Given a string, this method looks if the '#' character is present.
    * If true, the line is truncated from that point onwards until the end
@@ -155,11 +172,28 @@ 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) {
+        if (fs.existsSync(key)) {
+          const stat = fs.statSync(key);
+          if ((stat.mtime - value > 0)) {
+            return true;
+          }
+        } else
+          return true;
+      }
+    } else {
+      return true;
+    }
+    return false;
+  }
   /**
     * adds name value pairs from the input buffer into the hash table.
     * @param {string} ibuf
     */
-  addNLPListElement(ibuf) {
+  async addNLPListElement(ibuf, depth) {
     const res = ibuf.split(/\r?\n/).filter(element => element);
     for (let i = 0; i < res.length; i++) {
       if (res[i].charAt(0) != '(') {
@@ -169,14 +203,17 @@ class NLParamParser {
       const name = nvp.name;
       const uname = name.toUpperCase();
       nvp.name = uname;
-      const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
-      for (let i = 0; i < unames.length; i++) {
-        this.ht.set(unames[i], nvp);
+      // support for ifile
+      if (uname == 'IFILE') {
+        await this.start(nvp.atom, depth + 1);
+      } else {
+        const unames = uname.split(","); //multiple aliases (alias1, alias2, alias3)
+        for (let i = 0; i < unames.length; i++) {
+          this.ht.set(unames[i], nvp);
+        }
       }
     }
   }
-
-
   toString() {
     let out = "";
     this.ht.forEach((value) => {

package/lib/thin/sqlnet/sessionAtts.js

@@ -77,6 +77,9 @@ class SessionAtts {
       if (typeof params.walletPassword === 'string') {
         this.nt.walletPassword = params.walletPassword;
       }
+      if (typeof params.walletContent === 'string') {
+        this.nt.wallet = params.walletContent;
+      }
       if (params.expireTime > 0) {
         this.nt.expireTime = params.expireTime * 1000 * 60;
       }
@@ -135,6 +138,15 @@ class SessionAtts {
     });
   }
 
+  /**
+   * Clear wallet
+   */
+  clearWallet() {
+    if (this.nt.wallet && Buffer.isBuffer(this.nt.wallet))
+      this.nt.wallet.fill(0);
+    this.nt.wallet = null;
+  }
+
   /**
    * Prepare attributes for connection, Generate Connection ID and read Wallet file
    *
@@ -151,7 +163,7 @@ class SessionAtts {
     }
     this.nt.connectionId = this.connectionId;
 
-    if (protocol && (protocol.toUpperCase() == "TCPS" && this.nt.walletFile)) {
+    if (protocol && (protocol.toUpperCase() == "TCPS" && !this.nt.wallet && this.nt.walletFile)) {
       this.nt.wallet = await this.readWalletFile();
     }
 

package/lib/thin/statement.js

@@ -29,6 +29,7 @@
 const { Buffer } = require('buffer');
 const constants = require('../constants');
 const errors = require('../errors');
+const protoConstants = require('./protocol/constants');
 
 /**
  * It is used to cache the metadata about bind information
@@ -519,6 +520,9 @@ class Statement {
   // cursor also requires a full execute.
   //---------------------------------------------------------------------------
   _setVariable(bindInfo, variable) {
+    if (variable.type._oraTypeNum === protoConstants.TNS_DATA_TYPE_CURSOR) {
+      this.requiresFullExecute = true;
+    }
     if (variable.maxSize !== bindInfo.maxSize
         || variable.dir !== bindInfo.dir
         || variable.isArray !== bindInfo.isArray

package/lib/thin/statementCache.js

@@ -146,6 +146,11 @@ class StatementCache {
     return stmt;
   }
 
+  clearCursor(statement) {
+    this._addCursorToClose(statement);
+    statement.cursorId = 0;
+  }
+
   //---------------------------------------------------------------------------
   // returnStatement()
   // Return the statement to the statement cache, if applicable. If the

package/lib/transformer.js

@@ -228,8 +228,7 @@ function transformValueIn(info, value, options) {
     return value._impl;
 
   // handle vectors
-  } else if (value instanceof Float32Array || value instanceof Float64Array ||
-    value instanceof Int8Array) {
+  } else if (nodbUtil.isVectorValue(value)) {
     checkType(info, options, types.DB_TYPE_VECTOR);
     return value;
   } else if (info.type === types.DB_TYPE_VECTOR && Array.isArray(value)) {

package/lib/types.js

@@ -112,7 +112,7 @@ function getTypeByOraTypeNum(oraTypeNum, csfrm) {
 
 const DB_TYPE_BFILE = new DbType(2020,
   "DB_TYPE_BFILE", "BFILE",
-  { oraTypeNum: 114, bufferSizeFactor: 112 });
+  { oraTypeNum: 114, bufferSizeFactor: 4000 });
 const DB_TYPE_BINARY_DOUBLE = new DbType(2008,
   "DB_TYPE_BINARY_DOUBLE", "BINARY_DOUBLE",
   { oraTypeNum: 101, bufferSizeFactor: 8 });

package/lib/util.js

@@ -31,6 +31,7 @@ const errors = require('./errors.js');
 const process = require('process');
 const util = require('util');
 const types = require('./types.js');
+const constants = require('./constants.js');
 
 // node-oracledb version number
 let packageJSON;
@@ -224,6 +225,32 @@ function isObjectOrArray(value) {
   return (value !== null && typeof value === 'object') || Array.isArray(value);
 }
 
+//---------------------------------------------------------------------------
+// isPrivilege()
+//
+// Returns a boolean indicating if the supplied value is a valid privilege.
+//---------------------------------------------------------------------------
+function isPrivilege(value) {
+  // Privileges are mutually exclusive and cannot be specified together
+  // except SYSPRELIM, which cannot be specified alone, it is specified in a
+  // combo with SYSOPER or SYSDBA.  SYSPRELIM is used only for
+  // startup/shutdown
+
+  // If SYSPRELIM specified, clear the bit
+  if (value & constants.SYSPRELIM) {
+    value = value ^ constants.SYSPRELIM;
+  }
+  return (
+    value === constants.SYSASM ||
+    value === constants.SYSBACKUP ||
+    value === constants.SYSDBA ||
+    value === constants.SYSDG ||
+    value === constants.SYSKM ||
+    value === constants.SYSOPER ||
+    value === constants.SYSRAC
+  );
+}
+
 function isShardingKey(value) {
   if (!Array.isArray(value))
     return false;
@@ -250,6 +277,36 @@ function isXid(value) {
       typeof value.branchQualifier === 'string'));
 }
 
+function normalizeXid(value) {
+  let normalizedXid;
+  if (Buffer.isBuffer(value.globalTransactionId) &&
+    Buffer.isBuffer(value.branchQualifier)) {
+    normalizedXid = value;
+  } else {
+    normalizedXid = {
+      formatId: value.formatId,
+      globalTransactionId: value.globalTransactionId,
+      branchQualifier: value.branchQualifier
+    };
+    if (typeof value.globalTransactionId === 'string') {
+      normalizedXid.globalTransactionId = Buffer.from(value.globalTransactionId);
+    }
+    if (typeof value.branchQualifier === 'string') {
+      normalizedXid.branchQualifier = Buffer.from(value.branchQualifier);
+    }
+  }
+  if (normalizedXid.globalTransactionId.length > 64) {
+    errors.throwErr(errors.ERR_INVALID_TRANSACTION_SIZE,
+      normalizedXid.globalTransactionId.length);
+  }
+  if (normalizedXid.branchQualifier.length > 64) {
+    errors.throwErr(errors.ERR_INVALID_BRANCH_SIZE,
+      normalizedXid.branchQualifier.length);
+  }
+
+  return normalizedXid;
+}
+
 function verifySodaDoc(content) {
   if (isSodaDocument(content))
     return content._impl;
@@ -335,8 +392,9 @@ function addTypeProperties(obj, attrName) {
 // -----------------------------------------------------------------------------
 function isVectorValue(value) {
   return (value instanceof Float32Array ||
-      value instanceof Float64Array ||
-      value instanceof Int8Array);
+    value instanceof Float64Array ||
+    value instanceof Int8Array || (Object.getPrototypeOf(value)
+      === Uint8Array.prototype));
 }
 
 //-----------------------------------------------------------------------------
@@ -369,12 +427,14 @@ module.exports = {
   isArrayOfStrings,
   isObject,
   isObjectOrArray,
+  isPrivilege,
   isShardingKey,
   isSodaDocument,
   isTokenExpired,
   isTokenValid,
   isVectorValue,
   isXid,
+  normalizeXid,
   makeDate,
   preventConcurrent,
   serialize,

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "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.5.0-darwin-x64.node-buildinfo.txt

@@ -1 +0,0 @@
-oracledb-6.5.0-darwin-x64.node v20.11.1 91a7f419eccbfcd18513c19cd25f55f18a4d8ccc 42edf925eedae73b0d5bd7777167a21987bafc89 Tue, 30 Apr 2024 20:12:57 GMT

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

@@ -1 +0,0 @@
-91a7f419eccbfcd18513c19cd25f55f18a4d8ccc

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

@@ -1 +0,0 @@
-oracledb-6.5.0-linux-arm64.node v18.19.1 91a7f419eccbfcd18513c19cd25f55f18a4d8ccc 42edf925eedae73b0d5bd7777167a21987bafc89 Wed, 01 May 2024 04:29:37 GMT

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

@@ -1 +0,0 @@
-oracledb-6.5.0-linux-x64.node v16.20.2 91a7f419eccbfcd18513c19cd25f55f18a4d8ccc 42edf925eedae73b0d5bd7777167a21987bafc89 Wed, 01 May 2024 04:22:59 GMT

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

@@ -1 +0,0 @@
-oracledb-6.5.0-win32-x64.node v18.16.0 91a7f419eccbfcd18513c19cd25f55f18a4d8ccc 42edf925eedae73b0d5bd7777167a21987bafc89 Wed, 01 May 2024 04:34:23 GMT