oracledb 6.4.0 → 6.5.1

package/lib/thin/statementCache.js

@@ -71,20 +71,37 @@ class StatementCache {
   }
 
   //---------------------------------------------------------------------------
-  //clearOpenCursors() {
+  //clearCursors() {
   // Clears the list of open cursors and removes the list of cursors that
   // need to be closed. This is required when a DRCP session change has
   // taken place as the cursor ID values are invalidated.
   //---------------------------------------------------------------------------
-  clearOpenCursors() {
+  clearCursors() {
     const newOpenCursors = new Set();
     for (const stmt of this._openCursors) {
-      stmt.cursorId = 0;
-      if (stmt.inUse) {
+      if (stmt.inUse || stmt.returnToCache) {
+        stmt.pendingClear = true;
         newOpenCursors.add(stmt);
       }
+      stmt._clearState();
     }
     this._openCursors = newOpenCursors;
+    this._cursorsToClose.clear();
+  }
+
+  //---------------------------------------------------------------------------
+  //clearPendingState() {
+  // Clears state for statment with pending clear flag set and not in use.
+  // This will clear all state for open cursors.
+  // Called after rows processing is completed.
+  //---------------------------------------------------------------------------
+  clearPendingStatus() {
+    for (const stmt of this._openCursors) {
+      if (stmt.pendingClear && !stmt.inUse) {
+        stmt._clearAllState();
+        stmt.pendingClear = false;
+      }
+    }
   }
 
   //---------------------------------------------------------------------------
@@ -94,14 +111,10 @@ class StatementCache {
   // supposed to be cached, a copy will be made (and not returned to the
   // cache).
   //---------------------------------------------------------------------------
-  getStatement(sql, cacheStatement = false) {
+  getStatement(sql, cacheStatement = false, forceNew = false) {
     let stmt = null;
     if (sql) {
       stmt = this._cachedStatements.get(sql);
-      if (!cacheStatement) {
-        this._openCursors.add(stmt);
-        this._cachedStatements.delete(sql);
-      }
     }
     if (!stmt) {
       stmt = new Statement();
@@ -114,17 +127,30 @@ class StatementCache {
         this._adjustCache();
       }
       this._openCursors.add(stmt);
-    } else if (stmt.inUse || !cacheStatement) {
+    } else if (forceNew || stmt.inUse) {
+      if (!cacheStatement) {
+        this._addCursorToClose(stmt);
+        this._cachedStatements.delete(sql);
+      }
       stmt = stmt._copy();
       this._openCursors.add(stmt);
+    } else if (!cacheStatement) {
+      this._cachedStatements.delete(sql);
+      stmt.returnToCache = false;
     } else {
       this._cachedStatements.delete(sql);
       this._cachedStatements.set(sql, stmt);
     }
+    this._openCursors.add(stmt);
     stmt.inUse = true;
     return stmt;
   }
 
+  clearCursor(statement) {
+    this._addCursorToClose(statement);
+    statement.cursorId = 0;
+  }
+
   //---------------------------------------------------------------------------
   // returnStatement()
   // Return the statement to the statement cache, if applicable. If the
@@ -146,9 +172,11 @@ class StatementCache {
     }
     if (statement.returnToCache) {
       statement.inUse = false;
-    } else if (statement.cursorId !== 0) {
+    } else {
       this._addCursorToClose(statement);
     }
+    // clear all state for statement which is having flag set and not in use
+    this.clearPendingStatus();
   }
 
   //---------------------------------------------------------------------------

package/lib/thin/util.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -254,5 +254,5 @@ module.exports = {
   getOutBinds,
   checkProxyUserValidity,
   checkCredentials,
-  normalizePrivateKey
+  normalizePrivateKey,
 };

package/lib/transformer.js

@@ -89,7 +89,7 @@ function transformJsonValue(value) {
   if (value === undefined || value === null ||
     typeof value === 'number' || typeof value === 'string' ||
     typeof value === 'boolean' || Buffer.isBuffer(value) ||
-    util.isDate(value) || nodbUtil.isVectorValue(value))
+    util.types.isDate(value) || nodbUtil.isVectorValue(value))
     return value;
 
   // arrays are transformed to a new array with processed values
@@ -105,6 +105,12 @@ function transformJsonValue(value) {
   if (value instanceof BaseDbObject)
     return {fields: [], values: []};
 
+  // JsonId is a special type to represent autogenerated id
+  // for SODA documents.
+  if (value instanceof types.JsonId) {
+    return value;
+  }
+
   // all other objects are transformed to an object with two arrays (fields
   // and values)
   const outValue = {};
@@ -166,7 +172,7 @@ function transformValueIn(info, value, options) {
     return value;
 
   // handle numbers
-  } else if (typeof value === 'number') {
+  } else if (typeof value === 'number' || typeof value === 'bigint') {
     checkType(info, options,
       types.DB_TYPE_NUMBER,
       types.DB_TYPE_BINARY_INTEGER,
@@ -183,7 +189,7 @@ function transformValueIn(info, value, options) {
     return value;
 
   // handle dates
-  } else if (util.isDate(value)) {
+  } else if (util.types.isDate(value)) {
     checkType(info, options,
       types.DB_TYPE_TIMESTAMP,
       types.DB_TYPE_TIMESTAMP_TZ,

package/lib/types.js

@@ -332,6 +332,13 @@ dbTypeByColumnTypeName.set("SMALLINT", DB_TYPE_NUMBER);
 dbTypeByColumnTypeName.set("TIMESTAMP WITH LOCAL TZ", DB_TYPE_TIMESTAMP_LTZ);
 dbTypeByColumnTypeName.set("TIMESTAMP WITH TZ", DB_TYPE_TIMESTAMP_TZ);
 
+// It abstracts the autogenerated SODA Document key.
+class JsonId extends Uint8Array {
+  toJSON() {
+    return (Buffer.from(this.buffer).toString('hex'));
+  }
+}
+
 module.exports = {
   DbType,
   DB_TYPE_BFILE,
@@ -368,5 +375,6 @@ module.exports = {
   DB_TYPE_XMLTYPE,
   getTypeByColumnTypeName,
   getTypeByNum,
-  getTypeByOraTypeNum
+  getTypeByOraTypeNum,
+  JsonId
 };

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;
@@ -231,7 +258,7 @@ function isShardingKey(value) {
     const element = value[i];
     const ok = typeof element === 'string' ||
       typeof element === 'number' || Buffer.isBuffer(element) ||
-      util.isDate(element);
+      util.types.isDate(element);
     if (!ok)
       return false;
   }
@@ -369,6 +396,7 @@ module.exports = {
   isArrayOfStrings,
   isObject,
   isObjectOrArray,
+  isPrivilege,
   isShardingKey,
   isSodaDocument,
   isTokenExpired,

package/lib/version.js

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

package/package.json

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

@@ -1 +0,0 @@
-oracledb-6.4.0-darwin-x64.node v18.17.0 df971fa2503fcf9ab4a63f2f2508f5fb5780c0e1 31cd3b6682f32ad860df63d1dd06e3bf1c5e62aa Thu, 29 Feb 2024 13:53:47 GMT

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

@@ -1 +0,0 @@
-df971fa2503fcf9ab4a63f2f2508f5fb5780c0e1

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

@@ -1 +0,0 @@
-oracledb-6.4.0-linux-arm64.node v18.19.0 df971fa2503fcf9ab4a63f2f2508f5fb5780c0e1 31cd3b6682f32ad860df63d1dd06e3bf1c5e62aa Thu, 29 Feb 2024 15:01:23 GMT

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

@@ -1 +0,0 @@
-oracledb-6.4.0-linux-x64.node v16.20.2 df971fa2503fcf9ab4a63f2f2508f5fb5780c0e1 31cd3b6682f32ad860df63d1dd06e3bf1c5e62aa Thu, 29 Feb 2024 14:56:18 GMT

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

@@ -1 +0,0 @@
-oracledb-6.4.0-win32-x64.node v18.16.0 df971fa2503fcf9ab4a63f2f2508f5fb5780c0e1 31cd3b6682f32ad860df63d1dd06e3bf1c5e62aa Thu, 29 Feb 2024 15:35:39 GMT