oracledb 6.0.0 → 6.0.1

package/README.md

@@ -1,10 +1,10 @@
-# node-oracledb version 6.0.0
+# node-oracledb version 6.0.1
 
 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 to connect Node.js 14.6, or later, to Oracle
 Database.  Older versions of node-oracledb may work with older versions of
 Node.js.
 

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

@@ -0,0 +1 @@
+oracledb-6.0.1-darwin-x64.node v16.20.0 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Fri, 02 Jun 2023 22:13:14 GMT

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

@@ -0,0 +1 @@
+628884c63240a6680e2dd5a9ff5006cbf373348f

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

@@ -0,0 +1 @@
+oracledb-6.0.1-linux-arm64.node v16.19.1 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Fri, 02 Jun 2023 16:31:07 GMT

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

@@ -0,0 +1 @@
+oracledb-6.0.1-linux-x64.node v16.20.0 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Sat, 03 Jun 2023 06:55:38 GMT

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

@@ -0,0 +1 @@
+oracledb-6.0.1-win32-x64.node v16.19.0 628884c63240a6680e2dd5a9ff5006cbf373348f ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Fri, 02 Jun 2023 16:39:59 GMT

package/examples/README.md

@@ -108,6 +108,6 @@ File Name                                                 | Description
 [`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 format a queried number in a locale-specific way
+[`typehandlernum.js`](typehandlernum.js)                  | Show how a type handler can alter queried numbers
 [`version.js`](version.js)                                | Shows the node-oracledb version attributes
 [`webapp.js`](webapp.js)                                  | A simple web application using a connection pool

package/lib/aqDeqOptions.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2019, 2023, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require('./constants.js');
 const errors = require('./errors.js');
 

package/lib/aqQueue.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require('./constants.js');
 const errors = require('./errors.js');
 const nodbUtil = require('./util.js');

package/lib/connection.js

@@ -28,6 +28,7 @@
 
 const AqQueue = require('./aqQueue.js');
 const BaseDbObject = require('./dbObject.js');
+const { Buffer } = require('buffer');
 const Lob = require('./lob.js');
 const ResultSet = require('./resultset.js');
 const SodaDatabase = require('./sodaDatabase.js');
@@ -36,6 +37,7 @@ const QueryStream = require('./queryStream.js');
 const errors = require('./errors.js');
 const nodbUtil = require('./util.js');
 const impl = require('./impl');
+const process = require('process');
 const util = require('util');
 const constants = require('./constants.js');
 const settings = require('./settings.js');

package/lib/errors.js

@@ -136,6 +136,7 @@ const ERR_WRONG_VALUE_FOR_DBOBJECT_ATTR = 134;
 const ERR_WRONG_VALUE_FOR_DBOBJECT_ELEM = 135;
 const ERR_WRONG_CRED_FOR_EXTAUTH = 136;
 const ERR_MISSING_BIND_VALUE = 137;
+const ERR_SERVER_VERSION_NOT_SUPPORTED = 138;
 
 // Oracle Net layer errors start from 500
 const ERR_CONNECTION_CLOSED = 500;
@@ -314,7 +315,7 @@ messages.set(ERR_INVALID_NUMBER_OF_CONNECTIONS,         // NJS-092
 messages.set(ERR_EXEC_MODE_ONLY_FOR_DML,                // NJS-095
   'setting "batchErrors" or "dmlRowCounts" to true is only permitted for DML statements');
 messages.set(ERR_INVALID_BIND_NAME,                     // NJS-097
-  'no bind placeholder named ":%s" was found in the SQL text');
+  'no bind placeholder named ":%s" was found in the statement text');
 messages.set(ERR_WRONG_NUMBER_OF_POSITIONAL_BINDS,      // NJS-098
   '%s positional bind values are required but %s were provided');
 messages.set(ERR_BUFFER_LENGTH_INSUFFICIENT,            // NJS-099
@@ -393,6 +394,8 @@ messages.set(ERR_WRONG_CRED_FOR_EXTAUTH,                // NJS-136
   'user name and password cannot be set when using external authentication');
 messages.set(ERR_MISSING_BIND_VALUE,                    // NJS-137
   'a bind variable replacement value for placeholder ":%s" was not provided');
+messages.set(ERR_SERVER_VERSION_NOT_SUPPORTED,          // NJS-138
+  'connections to this database server version are not supported by node-oracledb in Thin mode');
 
 // Oracle Net layer errors
 
@@ -763,6 +766,7 @@ module.exports = {
   ERR_WRONG_VALUE_FOR_DBOBJECT_ELEM,
   ERR_WRONG_CRED_FOR_EXTAUTH,
   ERR_MISSING_BIND_VALUE,
+  ERR_SERVER_VERSION_NOT_SUPPORTED,
   ERR_CONNECTION_CLOSED_CODE: `${ERR_PREFIX}-${ERR_CONNECTION_CLOSED}`,
   assert,
   assertArgCount,

package/lib/lob.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const { Duplex } = require('stream');
 const constants = require('./constants.js');
 const errors = require('./errors.js');

package/lib/oracledb.js

@@ -31,6 +31,7 @@ const nodbUtil = require('./util.js');
 const errors = require('./errors.js');
 const types = require('./types.js');
 const impl = require('./impl');
+const process = require('process');
 const util = require('util');
 
 // This version of node-oracledb works with Node.js 14.6 or later.
@@ -68,7 +69,6 @@ const defaultPoolAlias = 'default';
 let _initOracleClientArgs;
 let _thinDriverInitialized = false;
 
-
 // Load the Oracledb binary
 function _initCLib() {
   /*global __non_webpack_require__*/  // quieten eslint

package/lib/poolStatistics.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const process = require('process');
 const settings = require('./settings.js');
 
 //-----------------------------------------------------------------------------

package/lib/queryStream.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2015, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2015, 2023, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -26,6 +26,7 @@
 
 'use strict';
 
+const process = require('process');
 const { Readable } = require('stream');
 
 class QueryStream extends Readable {

package/lib/sodaDatabase.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const SodaCollection = require('./sodaCollection.js');
 const SodaDocument = require('./sodaDocument.js');
 const errors = require('./errors.js');

package/lib/thin/connection.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const ConnectionImpl = require('../impl/connection.js');
 const ThinResultSetImpl = require('./resultSet.js');
 const ThinLobImpl  = require("./lob.js");
@@ -36,6 +37,7 @@ const { Statement } = require("./statement");
 const thinUtil = require('./util');
 const sqlNetConstants = require('./sqlnet/constants.js');
 const constants = require('./protocol/constants.js');
+const process = require('process');
 const types = require('../types.js');
 const errors = require("../errors.js");
 const messages = require('./protocol/messages');
@@ -528,6 +530,13 @@ class ThinConnectionImpl extends ConnectionImpl {
     }
 
     this._protocol = new Protocol(this);
+
+    // check if the protocol version supported by the database is high
+    // enough; if not, reject the connection immediately
+    if (this._protocol.caps.protocolVersion < constants.TNS_VERSION_MIN_ACCEPTED) {
+      errors.throwErr(errors.ERR_SERVER_VERSION_NOT_SUPPORTED);
+    }
+
     try {
       let message = new messages.ProtocolMessage(this);
       await this._protocol._processMessage(message);
@@ -568,40 +577,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 +905,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;

package/lib/thin/dbObject.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require('./protocol/constants.js');
 const errors = require('../errors.js');
 const types = require('../types.js');

package/lib/thin/lob.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const LobImpl = require('../impl/lob.js');
 const constants = require('./protocol/constants.js');
 const LobOpMessage = require('./protocol/messages/lobOp.js');

package/lib/thin/protocol/buffer.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require("./constants.js");
 const errors = require("../../errors.js");
 const settings = require("../../settings.js");
@@ -686,7 +687,9 @@ class BaseBuffer {
     let numBytes = value.length;
     if (numBytes <= constants.TNS_MAX_SHORT_LENGTH) {
       this.writeUInt8(numBytes);
-      this.writeBytes(value);
+      if (numBytes > 0) {
+        this.writeBytes(value);
+      }
     } else {
       let start = 0;
       this.writeUInt8(constants.TNS_LONG_LENGTH_INDICATOR);
@@ -984,7 +987,7 @@ class BaseBuffer {
   writeUInt64BE(n) {
     const buf = this.reserveBytes(8);
     buf.writeUInt32BE(0);
-    buf.writeUInt32BE(n);
+    buf.writeUInt32BE(n, 4);
   }
 
   //---------------------------------------------------------------------------

package/lib/thin/protocol/capabilities.js

@@ -26,7 +26,7 @@
 
 'use strict';
 
-const Buffer = require("buffer").Buffer;
+const { Buffer } = require('buffer');
 const constants = require("./constants.js");
 const errors = require('../../errors');
 
@@ -46,6 +46,7 @@ class Capabilities {
     this.runtimeCaps = Buffer.alloc(constants.TNS_RCAP_MAX);
     this.initCompileCaps();
     this.initRuntimeCaps();
+    this.maxStringSize = 0;
   }
 
   adjustForServerCompileCaps(serverCaps) {
@@ -56,8 +57,12 @@ class Capabilities {
     }
   }
 
-  adjustForServerRuntimeCaps() {
-    // nothing to do currently
+  adjustForServerRuntimeCaps(serverCaps) {
+    if (serverCaps[constants.TNS_RCAP_TTC] & constants.TNS_RCAP_TTC_32K) {
+      this.maxStringSize = 32767;
+    } else {
+      this.maxStringSize = 4000;
+    }
   }
 
   initCompileCaps() {

package/lib/thin/protocol/constants.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require('../../constants.js');
 
 module.exports = {
@@ -557,6 +558,7 @@ module.exports = {
   // versions
   TNS_VERSION_DESIRED: 316,
   TNS_VERSION_MINIMUM: 300,
+  TNS_VERSION_MIN_ACCEPTED: 315,
   TNS_VERSION_MIN_LARGE_SDU: 315,
 
   // other connection constants
@@ -684,7 +686,6 @@ module.exports = {
   TNS_DURATION_MID: 0x80000000,
   TNS_DURATION_OFFSET: 60,
   TNS_DURATION_SESSION: 10,
-  TNS_MIN_LONG_LENGTH: 0x8000,
   TNS_MAX_LONG_LENGTH: 0x7fffffff,
   TNS_SDU: 8192,
   TNS_TDU: 65535,

package/lib/thin/protocol/encryptDecrypt.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -26,7 +26,7 @@
 
 'use strict';
 
-const Buffer = require('buffer').Buffer;
+const { Buffer } = require('buffer');
 const crypto = require('crypto');
 
 let algorithm = 'aes-256-cbc';

package/lib/thin/protocol/messages/auth.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require("../constants.js");
 const errors = require("../../../errors.js");
 const os = require("os");

package/lib/thin/protocol/messages/base.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require("../constants.js");
 const errors = require("../../../errors.js");
 

package/lib/thin/protocol/messages/dataType.js

@@ -38,7 +38,16 @@ const Message = require("./base.js");
  */
 class DataTypeMessage extends Message {
 
-  decode() { }
+  processMessage(buf) {
+    while (true) {        // eslint-disable-line
+      const dataType = buf.readUInt16BE();
+      if (dataType === 0)
+        break;
+      const convDataType = buf.readUInt16BE();
+      if (convDataType !== 0)
+        buf.skipBytes(4);
+    }
+  }
 
   encode(buf) {
     buf.writeUInt8(constants.TNS_MSG_TYPE_DATA_TYPES);

package/lib/thin/protocol/messages/execute.js

@@ -275,7 +275,7 @@ class ExecuteMessage extends MessageWithData {
     // no rows have yet been sent so the header information needs to be sent
     if (this.currentRow === 0) {
       let stmt = this.statement;
-      if (stmt.cursorId !== 0 && !stmt.requiresFullExecute && !stmt.requiresDefine && !stmt.isDdl) {
+      if (stmt.cursorId !== 0 && !stmt.requiresFullExecute && !this.parseOnly && !stmt.requiresDefine && !stmt.isDdl && !this.batchErrors) {
         if (stmt.isQuery && !stmt.requiresDefine && this.options.prefetchRows > 0) {
           this.functionCode = constants.TNS_FUNC_REEXECUTE_AND_FETCH;
         } else {

package/lib/thin/protocol/messages/lobOp.js

@@ -26,8 +26,9 @@
 
 'use strict';
 
-const Message = require('./base.js');
+const { Buffer } = require('buffer');
 const constants = require('../constants.js');
+const Message = require('./base.js');
 
 /**
  * Abstracts all LOB operations.

package/lib/thin/protocol/messages/withData.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const utils = require("../utils");
 const constants = require("../constants.js");
 const Message = require("./base.js");
@@ -95,7 +96,9 @@ class MessageWithData extends Message {
 
   processErrorInfo(buf) {
     super.processErrorInfo(buf);
-    this.statement.cursorId = this.errorInfo.cursorId;
+    if (this.errorInfo.cursorId !== 0) {
+      this.statement.cursorId = this.errorInfo.cursorId;
+    }
     if (!this.statement.isPlSql) {
       this.statement.rowCount = this.errorInfo.rowCount;
     }
@@ -111,11 +114,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) {
@@ -450,10 +450,12 @@ class MessageWithData extends Message {
 
     if (!this.inFetch) {
       const actualNumBytes = buf.readSB4();
-      if (actualNumBytes !== 0 && colValue !== null) {
+      if (actualNumBytes < 0 && oraTypeNum === constants.TNS_DATA_TYPE_BOOLEAN) {
+        colValue = null;
+      } else if (actualNumBytes !== 0 && colValue !== null) {
         errors.throwErr(errors.ERR_INSUFFICIENT_BUFFER_FOR_BINDS);
       }
-    } else if (oraTypeNum === constants.TNS_DATA_TYPE_LONG || oraTypeNum === constants.TNS_DATA_TYPE_LONG_RAW || variable.maxSize >= constants.TNS_MIN_LONG_LENGTH) {
+    } else if (oraTypeNum === constants.TNS_DATA_TYPE_LONG || oraTypeNum === constants.TNS_DATA_TYPE_LONG_RAW || variable.maxSize > buf.caps.maxStringSize) {
       buf.skipSB4();                            // null indicator
       buf.skipUB4();                            // return code
     }
@@ -631,7 +633,7 @@ class MessageWithData extends Message {
       // expects that and complains if any other value is sent!
       buf.writeUInt8(0);
       buf.writeUInt8(0);
-      if (maxSize >= constants.TNS_MIN_LONG_LENGTH) {
+      if (maxSize > buf.caps.maxStringSize) {
         buf.writeUB4(constants.TNS_MAX_LONG_LENGTH);
       } else {
         buf.writeUB4(maxSize);
@@ -679,7 +681,7 @@ class MessageWithData extends Message {
           this.writeBindParamsColumn(buf, variable, variable.values[i]);
         }
       } else {
-        if (variable.maxSize >= constants.TNS_MIN_LONG_LENGTH) {
+        if (variable.maxSize > buf.caps.maxStringSize) {
           foundLong = true;
         } else {
           this.writeBindParamsColumn(buf, variable,
@@ -692,9 +694,8 @@ class MessageWithData extends Message {
         if (bindInfo.isReturnBind)
           continue;
         const variable = bindInfo.bindVar;
-        if (variable.maxSize >= constants.TNS_MIN_LONG_LENGTH) {
-          this.writeBindParamsColumn(buf, variable,
-            variable.values[pos + offset]);
+        if (variable.maxSize > buf.caps.maxStringSize) {
+          this.writeBindParamsColumn(buf, variable, variable.values[pos + offset]);
         }
       }
     }

package/lib/thin/protocol/oson.js

@@ -27,6 +27,7 @@
 'use strict';
 
 const { BaseBuffer, GrowableBuffer } = require('./buffer.js');
+const { Buffer } = require('buffer');
 const constants = require("./constants.js");
 const errors = require("../../errors.js");
 const types = require("../../types.js");

package/lib/thin/protocol/packet.js

@@ -27,9 +27,8 @@
 'use strict';
 
 const { BaseBuffer } = require('./buffer.js');
+const { Buffer } = require('buffer');
 const constants = require("./constants.js");
-
-const buffer = require("buffer");
 const oson = require('./oson.js');
 const utils = require('./utils.js');
 
@@ -485,8 +484,8 @@ class WritePacket extends BaseBuffer {
   }
 
   writeKeyValue(key, value, flags = 0) {
-    let keyBytesLen = buffer.Buffer.byteLength(key);
-    let valBytesLen = buffer.Buffer.byteLength(value);
+    const keyBytesLen = Buffer.byteLength(key);
+    const valBytesLen = Buffer.byteLength(value);
     this.writeUB4(keyBytesLen);
     this.writeBytesWithLength(Buffer.from(key));
     this.writeUB4(valBytesLen);

package/lib/thin/protocol/utils.js

@@ -26,6 +26,7 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const constants = require('./constants');
 const crypto = require('crypto');
 

package/lib/thin/sqlnet/networkSession.js

@@ -30,12 +30,13 @@ const Packet = require("./packet.js");
 const NTTCP = require("./ntTcp.js");
 const SessionAtts = require("./sessionAtts.js");
 const constants = require("./constants.js");
-const {createNode} = require('./connStrategy.js');
+const { createNode } = require('./connStrategy.js');
 const errors = require("../../errors.js");
-const {findNVPairRecurse, createNVPair, findValue } = require("./nvStrToNvPair.js");
-const Buffer = require("buffer").Buffer;
+const { findNVPairRecurse, createNVPair, findValue } = require("./nvStrToNvPair.js");
+const { Buffer } = require('buffer');
 const EzConnect = require("./ezConnectResolver.js");
-const {NLParamParser, tnsnamesFilePath} = require("./paramParser.js");
+const { NLParamParser, tnsnamesFilePath } = require("./paramParser.js");
+const process = require('process');
 
 /**
  *

package/lib/thin/sqlnet/ntTcp.js

@@ -26,7 +26,9 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const net = require("net");
+const process = require("process");
 const tls = require("tls");
 const http = require("http");
 const Timers = require('timers');

package/lib/thin/sqlnet/paramParser.js

@@ -28,6 +28,7 @@
 
 const {createNVPair, findValue} = require("./nvStrToNvPair.js");
 const fs = require('fs');
+const process = require('process');
 const readline = require('readline');
 const errors = require("../../errors.js");
 

package/lib/thin/statement.js

@@ -26,7 +26,7 @@
 
 'use strict';
 
-const buffer = require('buffer').Buffer;
+const { Buffer } = require('buffer');
 const constants = require('../constants');
 const thinUtil = require("./util.js");
 
@@ -48,8 +48,8 @@ const BIND_PATTERN = /(?<=:)\s*((?:".*?")|(?:[\p{L}][\p{L}\p{Nd}_\$#]*)|\p{Nd}+)
 const DML_RETURNING_KEY = /(?<=\bRETURN(?:ING)?\b)/si;
 const DML_RETURNING_INTO_KEY = /(?<=\bINTO\b)/gsi;
 
-const SINGLE_LINE_COMMENT_PATTERN = /--.*/;
-const MULTI_LINE_COMMENT_PATTERN = /\/\*.*?\*\//s;
+const SINGLE_LINE_COMMENT_PATTERN = /--.*/g;
+const MULTI_LINE_COMMENT_PATTERN = /\/\*.*?\*\//sg;
 const CONSTANT_STRING_PATTERN = /'.*?'/sg;
 
 /**
@@ -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;
@@ -203,7 +202,7 @@ class Statement {
   //---------------------------------------------------------------------------
   _prepare(sql) {
     this.sql = sql;
-    this.sqlBytes = buffer.from(this.sql, 'utf8');
+    this.sqlBytes = Buffer.from(this.sql, 'utf8');
     this.sqlLength = this.sqlBytes.length;
     // replace literals with a specific literal
     sql = sql.replace(CONSTANT_STRING_PATTERN, "'S'");

package/lib/transformer.js

@@ -27,6 +27,7 @@
 'use strict';
 
 const BaseDbObject = require('./dbObject.js');
+const { Buffer } = require('buffer');
 const Lob = require('./lob.js');
 const ResultSet = require('./resultset.js');
 const constants = require('./constants.js');
@@ -151,14 +152,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 +195,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,

package/lib/util.js

@@ -26,7 +26,9 @@
 
 'use strict';
 
+const { Buffer } = require('buffer');
 const errors = require('./errors.js');
+const process = require('process');
 const util = require('util');
 const types = require('./types.js');
 

package/lib/version.js

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

package/package.json

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

@@ -1 +0,0 @@
-oracledb-6.0.0-darwin-x64.node v16.20.0 860028aa05a0de50f81df433ab99d4f907f9a99a ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 16 May 2023 11:28:59 GMT

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

@@ -1 +0,0 @@
-860028aa05a0de50f81df433ab99d4f907f9a99a

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

@@ -1 +0,0 @@
-oracledb-6.0.0-linux-arm64.node v16.20.0 860028aa05a0de50f81df433ab99d4f907f9a99a ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 16 May 2023 11:56:16 GMT

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

@@ -1 +0,0 @@
-oracledb-6.0.0-linux-x64.node v16.20.0 860028aa05a0de50f81df433ab99d4f907f9a99a ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 16 May 2023 13:29:42 GMT

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

@@ -1 +0,0 @@
-oracledb-6.0.0-win32-x64.node v16.19.0 860028aa05a0de50f81df433ab99d4f907f9a99a ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Tue, 16 May 2023 13:40:01 GMT