Update 6.0.1 development info and pushbug fix and patch for Issue #1554

Author: sharadraju

README.md

@@ -1,10 +1,12 @@
-# node-oracledb version 6.0.0
+# node-oracledb version 6.0.1-dev
+
+**This release is under development and information may be incomplete**
 
 The node-oracledb add-on for Node.js powers high performance Oracle Database
 applications.  Applications can be written in TypeScript, or directly in
 JavaScript.
 
-Use node-oracledb 6.0.0 to connect Node.js 14.6, or later, to Oracle
+Use node-oracledb 6.0.1-dev to connect Node.js 14.6, or later, to Oracle
 Database.  Older versions of node-oracledb may work with older versions of
 Node.js.
 

doc/src/release_notes.rst

@@ -5,6 +5,10 @@
 node-oracledb Release Notes
 =============================
 
+node-oracledb `v6.0.1 <https://github.com/oracle/node-oracledb/compare/v6.0.0...v6.0.1>`__ (DD MON 2023)
+--------------------------------------------------------------------------------------------------------
+
+
 node-oracledb `v6.0.0 <https://github.com/oracle/node-oracledb/compare/v5.5.0...v6.0.0>`__ (24 May 2023)
 --------------------------------------------------------------------------------------------------------
 

lib/thin/connection.js

@@ -568,40 +568,34 @@ class ThinConnectionImpl extends ConnectionImpl {
     }
     if (statement.returnToCache) {
       statement.inUse = false;
-      this._adjustStatementCache();
     } else if (statement.cursorId !== 0) {
-      this._addCursorToClose(statement);
+      this._addCursorToClose(statement.cursorId);
     }
   }
 
   //---------------------------------------------------------------------------
   // Adds the cursors that needs to be closed to the _cursorsToClose set
   //---------------------------------------------------------------------------
-  _addCursorToClose(stmt) {
-    if (stmt.cursorId > 0 && this._cursorsToClose.has(stmt.cursorId)) {
-      const reason = `attempt to close cursor ${stmt.cursorId} twice`;
+  _addCursorToClose(cursorId) {
+    if (this._cursorsToClose.has(cursorId)) {
+      const reason = `attempt to close cursor ${cursorId} twice`;
       errors.throwErr(errors.ERR_INTERNAL, reason);
     }
-
-    if (this.statementCache.has(stmt.sql)) {
-      this.statementCache.delete(stmt.sql);
-      this._cursorsToClose.add(stmt.cursorId);
-    } else if (stmt.cursorId > 0) {
-      this._cursorsToClose.add(stmt.cursorId);
-    }
+    this._cursorsToClose.add(cursorId);
   }
 
   //---------------------------------------------------------------------------
   // Adjusts the statement cache to remove least recently used statements
   //---------------------------------------------------------------------------
   _adjustStatementCache() {
-    while (this.statementCache.size >= this.statementCacheSize) {
-      let stmt = this.statementCache.get(this.statementCache.keys().next().value);
-      this.statementCache.delete(this.statementCache.keys().next().value);
+    while (this.statementCache.size > this.statementCacheSize) {
+      const sql = this.statementCache.keys().next().value;
+      const stmt = this.statementCache.get(sql);
+      this.statementCache.delete(sql);
       if (stmt.inUse) {
         stmt.returnToCache = false;
       } else if (stmt.cursorId !== 0) {
-        this._addCursorToClose(stmt);
+        this._addCursorToClose(stmt.cursorId);
       }
     }
   }
@@ -902,12 +896,14 @@ class ThinConnectionImpl extends ConnectionImpl {
     if (!statement) {
       statement = new Statement();
       statement._prepare(sql);
-      if (cacheStatement && this.statementCache.size < this.statementCacheSize && !this._drcpEstablishSession && !statement.isDdl) {
-        this.statementCache.set(sql, statement);
+      if (cacheStatement && !this._drcpEstablishSession && !statement.isDdl &&
+          this.statementCacheSize > 0) {
         statement.returnToCache = true;
+        this.statementCache.set(sql, statement);
         this._adjustStatementCache();
       }
-    } else if (statement.inUse || !cacheStatement || this._drcpEstablishSession) {
+    } else if (statement.inUse || !cacheStatement ||
+        this._drcpEstablishSession) {
       if (!cacheStatement) {
         this.statementCache.delete(sql);
         statement.returnToCache = false;

lib/thin/protocol/messages/withData.js

@@ -111,11 +111,8 @@ class MessageWithData extends Message {
       this.errorInfo.num = 0;
       this.errorOccurred = false;
       this.statement.moreRowsToFetch = false;
-    } else if (this.errorInfo.num === constants.TNS_ERR_VAR_NOT_IN_SELECT_LIST) {
-      this.connection._addCursorToClose(this.statement);
-      this.connection.statementCache.delete(this.statement.sql);
     } else if (this.errorInfo.num !== 0 && this.errorInfo.cursorId !== 0) {
-      this.connection._addCursorToClose(this.statement);
+      this.connection._addCursorToClose(this.statement.cursorId);
       this.connection.statementCache.delete(this.statement.sql);
     }
     if (this.errorInfo.batchErrors) {

lib/thin/statement.js

@@ -110,8 +110,7 @@ class Statement {
   // Copying existing statement into new statement object required by drcp
   //---------------------------------------------------------------------------
   _copy() {
-    let copiedStatement = new Statement();
-    let bindInfoDict;
+    const copiedStatement = new Statement();
     copiedStatement.sql = this.sql;
     copiedStatement.sqlBytes = this.sqlBytes;
     copiedStatement.sqlLength = this.sqlLength;
@@ -121,16 +120,16 @@ class Statement {
     copiedStatement.isDdl = this.isDdl;
     copiedStatement.isReturning = this.isReturning;
     copiedStatement.bindInfoList = [];
-    for (let bindInfo of this.bindInfoList) {
-      copiedStatement.bindInfoList.push(bindInfo);
+    for (const bindInfo of this.bindInfoList) {
+      const newBindInfo = new BindInfo(bindInfo.bindName, bindInfo.isReturnBind);
+      copiedStatement.bindInfoList.push(newBindInfo);
     }
-    copiedStatement.bindInfoDict = new Map();
-    bindInfoDict = copiedStatement.bindInfoDict;
-    for (let bindInfoObj of this.bindInfoList) {
-      if (bindInfoDict.has(bindInfoObj.bindName)) {
-        bindInfoDict.get(bindInfoObj.bindName).push(bindInfoObj);
+    const bindInfoDict = copiedStatement.bindInfoDict = new Map();
+    for (const bindInfo of copiedStatement.bindInfoList) {
+      if (bindInfoDict.has(bindInfo.bindName)) {
+        bindInfoDict.get(bindInfo.bindName).push(bindInfo);
       } else {
-        bindInfoDict.set(bindInfoObj.bindName, [bindInfoObj]);
+        bindInfoDict.set(bindInfo.bindName, [bindInfo]);
       }
     }
     copiedStatement.returnToCache = false;

lib/transformer.js

@@ -151,14 +151,15 @@ function transformValueIn(info, value, options) {
       types.DB_TYPE_CLOB,
       types.DB_TYPE_NCLOB);
     if (info.type !== types.DB_TYPE_CLOB &&
-        info.type !== types.DB_TYPE_NCLOB &&
-        info.cqn === undefined &&
-        (info.maxSize === undefined || value.length > info.maxSize)) {
-      if (info.checkSize) {
-        errors.throwErr(errors.ERR_MAX_SIZE_TOO_SMALL, info.maxSize,
-          value.length, options.pos);
+        info.type !== types.DB_TYPE_NCLOB) {
+      const valueLen = Buffer.byteLength(value);
+      if (info.maxSize === undefined || valueLen > info.maxSize) {
+        if (info.checkSize) {
+          errors.throwErr(errors.ERR_MAX_SIZE_TOO_SMALL, info.maxSize,
+            valueLen, options.pos);
+        }
+        info.maxSize = valueLen;
       }
-      info.maxSize = value.length;
     }
     return value;
 
@@ -193,7 +194,7 @@ function transformValueIn(info, value, options) {
     checkType(info, options,
       types.DB_TYPE_RAW,
       types.DB_TYPE_BLOB);
-    if (info.type === types.DB_TYPE_RAW && info.cqn === undefined &&
+    if (info.type === types.DB_TYPE_RAW &&
         (info.maxSize === undefined || value.length > info.maxSize)) {
       if (info.checkSize) {
         errors.throwErr(errors.ERR_MAX_SIZE_TOO_SMALL, info.maxSize,

lib/version.js

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.0.0",
+  "version": "6.0.1-dev",
   "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/",