oracledb 6.0.1 → 6.0.3

package/README.md

@@ -1,10 +1,10 @@
-# node-oracledb version 6.0.1
+# node-oracledb version 6.0.3
 
 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.1 to connect Node.js 14.6, or later, to Oracle
+Use node-oracledb 6.0.3 to connect Node.js 14.6, or later, to Oracle
 Database.  Older versions of node-oracledb may work with older versions of
 Node.js.
 
@@ -20,32 +20,30 @@ See [Getting Started with Node-oracledb][1] and [Quick Start Node-oracledb Insta
 
 ## Documentation
 
-See [Documentation for the Oracle Database Node.js Add-on][32] and the [CHANGELOG][33].
+See [Documentation for the Oracle Database Node.js Add-on][9] and the [release
+notes][10].
 
 ## Examples
 
-See the [examples][30] directory.  Start with [examples/example.js][31].
+See the [examples][7] directory.  Start with [examples/example.js][8].
 
 ## Help
 
-Issues and questions about node-oracledb can be posted on [GitHub][3] or
-[Slack][5] ([link to join Slack][6]).
+Questions about node-oracledb can be posted on [GitHub][3] or [Slack][5] ([link
+to join Slack][6]).
 
 ## <a name="testing"></a> Tests
 
-To run the test suite see [test/README][34].
+To run the test suite see [test/README][11].
 
 ## Contributing
 
 This project welcomes contributions from the community. Before submitting a
-pull request, please [review our contribution guide][35].
-
-Oracle gratefully acknowledges the contributions to node-oracledb that have
-been made by the community.
+pull request, please [review our contribution guide][12].
 
 ## Security
 
-Please consult the [security guide](./SECURITY.md) for our responsible security
+Please consult the [security guide][13] for our responsible security
 vulnerability disclosure process.
 
 ## License
@@ -74,13 +72,14 @@ limitations under the License.
 
 [1]: https://node-oracledb.readthedocs.io/en/latest/user_guide/introduction.html#getstarted
 [2]: https://node-oracledb.readthedocs.io/en/latest/user_guide/installation.html#quickstart
-[3]: https://github.com/oracle/node-oracledb/issues
+[3]: https://github.com/oracle/node-oracledb/discussions
 [4]: https://oracle.github.io/node-oracledb
 [5]: https://node-oracledb.slack.com/
 [6]: https://join.slack.com/t/node-oracledb/shared_invite/enQtNDU4Mjc2NzM5OTA2LWMzY2ZlZDY5MDdlMGZiMGRkY2IzYjI5OGU4YTEzZWM5YjQ3ODUzMjcxNWQyNzE4MzM5YjNkYjVmNDk5OWU5NDM
-[30]: https://github.com/oracle/node-oracledb/blob/main/examples
-[31]: https://github.com/oracle/node-oracledb/blob/main/examples/example.js
-[32]: https://node-oracledb.readthedocs.io/en/latest/
-[33]: https://github.com/oracle/node-oracledb/blob/main/CHANGELOG.md
-[34]: https://github.com/oracle/node-oracledb/blob/main/test/README.md
-[35]: https://github.com/oracle/node-oracledb/blob/main/CONTRIBUTING.md
+[7]: https://github.com/oracle/node-oracledb/blob/main/examples
+[8]: https://github.com/oracle/node-oracledb/blob/main/examples/example.js
+[9]: https://node-oracledb.readthedocs.io/en/latest/
+[10]: https://node-oracledb.readthedocs.io/en/latest/release_notes.html
+[11]: https://github.com/oracle/node-oracledb/blob/main/test/README.md
+[12]: https://github.com/oracle/node-oracledb/blob/main/CONTRIBUTING.md
+[13]: https://github.com/oracle/node-oracledb/blob/main/SECURITY.md

package/SECURITY.md

@@ -21,7 +21,7 @@ security features are welcome on GitHub Issues.
 
 Security updates will be released on a regular cadence. Many of our projects
 will typically release security fixes in conjunction with the
-[Oracle Critical Patch Update][3] program. Additional
+Oracle Critical Patch Update program. Additional
 information, including past advisories, is available on our [security alerts][4]
 page.
 

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

@@ -0,0 +1 @@
+oracledb-6.0.3-darwin-x64.node v16.20.0 39d4fe42c06aaccc3feab18cc77fb27025d1fcbb ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Wed, 05 Jul 2023 21:49:52 GMT

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

@@ -0,0 +1 @@
+39d4fe42c06aaccc3feab18cc77fb27025d1fcbb

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

@@ -0,0 +1 @@
+oracledb-6.0.3-linux-arm64.node v16.20.0 39d4fe42c06aaccc3feab18cc77fb27025d1fcbb ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Wed, 05 Jul 2023 21:29:48 GMT

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

@@ -0,0 +1 @@
+oracledb-6.0.3-linux-x64.node v16.20.0 39d4fe42c06aaccc3feab18cc77fb27025d1fcbb ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Thu, 06 Jul 2023 06:38:15 GMT

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

@@ -0,0 +1 @@
+oracledb-6.0.3-win32-x64.node v16.19.0 39d4fe42c06aaccc3feab18cc77fb27025d1fcbb ccbaddf0256153ecfa6702c6ae1a4e5003e3775e Thu, 06 Jul 2023 06:41:18 GMT

package/lib/connection.js

@@ -146,6 +146,7 @@ class Connection extends EventEmitter {
       cls = this._buildDbObjectClass(objType);
       cls._connection = this;
       cls._objType = objType;
+      objType._connection = this._impl;
       this._dbObjectClasses.set(objType, cls);
     }
     return (cls);

package/lib/errors.js

@@ -161,7 +161,8 @@ const ERR_INVALID_SID = 519;
 const ERR_TNS_NAMES_FILE_MISSING = 520;
 const ERR_CONNECTION_EOF = 521;
 
-// define mapping for ODPI-C errors that need to be wrapped with NJS errors
+// define mapping for ODPI-C, OCI & ORA errors that need to be wrapped
+// with NJS errors
 const adjustErrorXref = new Map();
 adjustErrorXref.set("DPI-1010", ERR_CONNECTION_CLOSED);
 adjustErrorXref.set("DPI-1024", [ERR_INVALID_COLL_INDEX_GET, 'at index ([0-9]+) does']);
@@ -327,7 +328,7 @@ messages.set(ERR_MISSING_CREDENTIALS,                   // NJS-101
 messages.set(ERR_UNEXPECTED_END_OF_DATA,                // NJS-102
   'unexpected end of data: want %d bytes but only %d bytes are available');
 messages.set(ERR_UNEXPECTED_MESSAGE_TYPE,               // NJS-103
-  'unexpected message type %d received');
+  'unexpected message type %d received at position %d of packet %d');
 messages.set(ERR_POOL_HAS_BUSY_CONNECTIONS,             // NJS-104
   'connection pool cannot be closed because connections are busy');
 messages.set(ERR_NAN_VALUE,                             // NJS-105
@@ -343,9 +344,9 @@ messages.set(ERR_INVALID_TYPE_NUM,                      // NJS-109
 messages.set(ERR_INVALID_ORACLE_TYPE_NUM,               // NJS-110
   'invalid Oracle type number %d [csfrm: %d]');
 messages.set(ERR_UNEXPECTED_NEGATIVE_INTEGER,           // NJS-111
-  'internal error: read a negative integer when expecting a positive integer');
+  'internal error: read a negative integer when expecting a positive integer at position %d of packet %d');
 messages.set(ERR_INTEGER_TOO_LARGE,                     // NJS-112
-  'internal error: read integer of length %d when expecting integer of no more than length %d');
+  'internal error: read integer of length %d when expecting integer of no more than length %d at position %d of packet %d');
 messages.set(ERR_UNEXPECTED_DATA,                       // NJS-113
   'unexpected data received: %s');
 messages.set(ERR_OSON_FIELD_NAME_LIMITATION,            // NJS-114

package/lib/pool.js

@@ -47,6 +47,7 @@ class Pool extends EventEmitter {
     this._timeOfReset = this._createdDate = Date.now();
     this._sessionCallback = undefined;
     this._connRequestQueue = [];
+    this._connectionClass = settings.connectionClass;
   }
 
   //---------------------------------------------------------------------------
@@ -376,7 +377,9 @@ class Pool extends EventEmitter {
       errors.assertParamValue(nodbUtil.isObject(a1), 1);
       options = this._verifyGetConnectionOptions(a1);
     }
-    settings.addToOptions(options, "connectionClass");
+
+    // get connection class value from pool
+    options.connectionClass = this._connectionClass;
 
     // if pool is draining/closed, throw an appropriate error
     this._checkPoolOpen(true);

package/lib/settings.js

@@ -69,7 +69,7 @@ class Settings {
   // database are returned as though they used the JavaScript time zone
   // setting. TIMESTAMP WITH TIME ZONE and TIMESTAMP WITH LOCAL TIME ZONE data
   // are returned in native JavaScript format (since they contain time zone
-  // information).
+  // information). This is used only in Thick mode (from node-oracledb 6.0.0).
   //---------------------------------------------------------------------------
   _getDateComponents(useLocal, date) {
     if (useLocal) {

package/lib/thin/dbObject.js

@@ -35,6 +35,19 @@ const { GrowableBuffer } = require('./protocol/buffer.js');
 
 class DbObjectPickleBuffer extends GrowableBuffer {
 
+  //---------------------------------------------------------------------------
+  // _readBytesWithLength()
+  //
+  // Helper function that processes the number of bytes (if needed) and then
+  // acquires the specified number of bytes from the buffer.
+  //---------------------------------------------------------------------------
+  _readBytesWithLength(numBytes) {
+    if (numBytes === constants.TNS_LONG_LENGTH_INDICATOR) {
+      numBytes = this.readUInt32BE();
+    }
+    return this.readBytes(numBytes);
+  }
+
   //---------------------------------------------------------------------------
   // getIsAtomicNull()
   //
@@ -349,12 +362,12 @@ class ThinDbObjectImpl extends DbObjectImpl {
         return buf.readBinaryInteger();
       case types.DB_TYPE_VARCHAR:
       case types.DB_TYPE_CHAR:
-        return buf.readStr(constants.TNS_CS_IMPLICIT);
+        return buf.readStr(constants.CSFRM_IMPLICIT);
       case types.DB_TYPE_NVARCHAR:
       case types.DB_TYPE_NCHAR:
-        return buf.readStr(constants.TNS_CS_NCHAR);
+        return buf.readStr(constants.CSFRM_NCHAR);
       case types.DB_TYPE_RAW:
-        return buf.readBytesWithLength();
+        return Buffer.from(buf.readBytesWithLength());
       case types.DB_TYPE_BINARY_DOUBLE:
         return buf.readBinaryDouble();
       case types.DB_TYPE_BINARY_FLOAT:
@@ -365,7 +378,6 @@ class ThinDbObjectImpl extends DbObjectImpl {
       case types.DB_TYPE_TIMESTAMP_LTZ:
       case types.DB_TYPE_TIMESTAMP_TZ:
         return buf.readOracleDate(false);
-      case types.DB_TYPE_BLOB:
       case types.DB_TYPE_BOOLEAN:
         return buf.readBool();
       case types.DB_TYPE_OBJECT:
@@ -374,7 +386,7 @@ class ThinDbObjectImpl extends DbObjectImpl {
           return null;
         obj = new ThinDbObjectImpl(typeClass);
         if (obj._objType.isCollection || this._objType.isCollection) {
-          obj.packedData = buf.readBytesWithLength();
+          obj.packedData = Buffer.from(buf.readBytesWithLength());
         } else {
           obj._unpackDataFromBuf(buf);
         }

package/lib/thin/lob.js

@@ -121,10 +121,10 @@ class ThinLobImpl extends LobImpl {
   }
 
   getCsfrm() {
-    if (this.dbType._csfrm !== constants.TNS_CS_NCHAR) {
+    if (this.dbType._csfrm !== constants.CSFRM_NCHAR) {
       if (this._locator[constants.TNS_LOB_LOC_OFFSET_FLAG_3] &
           constants.TNS_LOB_LOC_FLAGS_VAR_LENGTH_CHARSET) {
-        return constants.TNS_CS_NCHAR;
+        return constants.CSFRM_NCHAR;
       }
     }
     return this.dbType._csfrm;

package/lib/thin/pool.js

@@ -144,13 +144,13 @@ class ThinPoolImpl extends PoolImpl {
   }
 
   //---------------------------------------------------------------------------
-  // get connection from pool
+  // credentials are obfuscated and stored in an object(userConfig) during
+  // pool creation. _getConnAttrs() method is used to deobfuscate encrypted
+  // credentials for creating new connections
   //---------------------------------------------------------------------------
-  async _connect(connAttrs) {
+  async _getConnAttrs() {
     let accessToken;
-    const conn = new ThinConnectionImpl();
-    conn._pool = this;
-    let clonedAttrs = Object.assign({}, connAttrs);
+    const clonedAttrs = Object.assign({}, this._userConfig);
     if (clonedAttrs.password === null) {
       clonedAttrs.password = protocolUtil.getDeobfuscatedValue(this._password,
         this._obfuscatedPassword);
@@ -204,9 +204,7 @@ class ThinPoolImpl extends PoolImpl {
         protocolUtil.getDeobfuscatedValue(this._privateKey,
           this._obfuscatedPrivateKey);
     }
-    await conn.connect(clonedAttrs);
-    clonedAttrs = null;
-    return conn;
+    return clonedAttrs;
   }
 
   //---------------------------------------------------------------------------
@@ -214,9 +212,6 @@ class ThinPoolImpl extends PoolImpl {
   // create new connection and return it
   //---------------------------------------------------------------------------
   async getConnection() {
-    if (settings.connectionClass !== '') {
-      this._userConfig.connectionClass = settings.connectionClass;
-    }
     return await this.acquire();
   }
 
@@ -318,8 +313,11 @@ class ThinPoolImpl extends PoolImpl {
   // Grows the pool to include the specified number of connections.
   //---------------------------------------------------------------------------
   async _growPool(numConns) {
+    const clonedAttrs = await this._getConnAttrs();
     while (numConns > 0) {
-      let conn = await this._connect(this._userConfig);
+      const conn = new ThinConnectionImpl();
+      conn._pool = this;
+      await conn.connect(clonedAttrs);
       conn._newSession = true;
       conn._dropSess = false;
       conn._lastTimeUsed = Date.now();

package/lib/thin/protocol/buffer.js

@@ -92,13 +92,13 @@ class BaseBuffer {
       return 0;
     } else if (size & 0x80) {
       if (!signed) {
-        errors.throwErr(errors.ERR_UNEXPECTED_NEGATIVE_INTEGER);
+        errors.throwErr(errors.ERR_UNEXPECTED_NEGATIVE_INTEGER, this.pos, this.packetNum);
       }
       isNegative = true;
       size = size & 0x7f;
     }
     if (size > maxSize) {
-      errors.throwErr(errors.ERR_INTEGER_TOO_LARGE, size, maxSize);
+      errors.throwErr(errors.ERR_INTEGER_TOO_LARGE, size, maxSize, this.pos, this.packetNum);
     }
     if (skip) {
       this.skipBytes(size);
@@ -375,18 +375,18 @@ class BaseBuffer {
     const obj = {};
     let numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.toid = this.readBytesWithLength();
+      obj.toid = Buffer.from(this.readBytesWithLength());
     numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.oid = this.readBytesWithLength();
+      obj.oid = Buffer.from(this.readBytesWithLength());
     numBytes = this.readUB4();
     if (numBytes > 0)
-      obj.snapshot = this.readBytesWithLength();
+      obj.snapshot = Buffer.from(this.readBytesWithLength());
     this.skipUB2();                     // version
     numBytes = this.readUB4();
     this.skipUB2();                     // flags
     if (numBytes > 0)
-      obj.packedData = this.readBytesWithLength();
+      obj.packedData = Buffer.from(this.readBytesWithLength());
     return obj;
   }
 
@@ -465,7 +465,7 @@ class BaseBuffer {
     if (!buf) {
       return null;
     }
-    if (csfrm === constants.TNS_CS_IMPLICIT)
+    if (csfrm === constants.CSFRM_IMPLICIT)
       return buf.toString();
 
     // need a copy of the buffer since swap16() changes the buffer in place and
@@ -748,7 +748,7 @@ class BaseBuffer {
     const ptr = this.reserveBytes(length);
     if (type === types.DB_TYPE_DATE || type == types.DB_TYPE_TIMESTAMP) {
       const year = date.getFullYear();
-      ptr[0] = Math.floor(year / 100) + 100;
+      ptr[0] = Math.trunc(year / 100) + 100;
       ptr[1] = year % 100 + 100;
       ptr[2] = date.getMonth() + 1;
       ptr[3] = date.getDate();
@@ -757,7 +757,7 @@ class BaseBuffer {
       ptr[6] = date.getSeconds() + 1;
     } else {
       const year = date.getUTCFullYear();
-      ptr[0] = Math.floor(year / 100) + 100;
+      ptr[0] = Math.trunc(year / 100) + 100;
       ptr[1] = year % 100 + 100;
       ptr[2] = date.getUTCMonth() + 1;
       ptr[3] = date.getUTCDate();

package/lib/thin/protocol/constants.js

@@ -40,7 +40,12 @@ module.exports = {
     constants.VERSION_MAJOR << 24 |
     constants.VERSION_MINOR << 20 |
     constants.VERSION_PATCH << 12,
+  CSFRM_IMPLICIT: constants.CSFRM_IMPLICIT,
+  CSFRM_NCHAR: constants.CSFRM_NCHAR,
   DRIVER_NAME: constants.DEFAULT_DRIVER_NAME + ' thn',
+  PURITY_DEFAULT: constants.PURITY_DEFAULT,
+  PURITY_NEW: constants.PURITY_NEW,
+  PURITY_SELF: constants.PURITY_SELF,
   SYSASM: constants.SYSASM,
   SYSBKP: constants.SYSBKP,
   SYSDBA: constants.SYSDBA,
@@ -88,10 +93,6 @@ module.exports = {
   TNS_MARKER_TYPE_BREAK: 1,
   TNS_MARKER_TYPE_RESET: 2,
 
-  // charset forms
-  TNS_CS_IMPLICIT: 1,
-  TNS_CS_NCHAR: 2,
-
   // data types
   TNS_DATA_TYPE_DEFAULT: 0,
   TNS_DATA_TYPE_VARCHAR: 1,

package/lib/thin/protocol/encryptDecrypt.js

@@ -138,18 +138,30 @@ class EncryptDecrypt {
     if (newPassword) {
       newPasswordBytes = Buffer.from(newPassword, 'utf8');
     }
-    let sessionKeyParta = this._decrypt(passwordHash, encodedServerKey);
-    let sessionKeyPartb = Buffer.alloc(32);
-    crypto.randomFillSync(sessionKeyPartb, 0, 32);
-    let encodedClientKey = this._encrypt(passwordHash, sessionKeyPartb);
-    authObj.sessionKey = encodedClientKey.slice().toString('hex').toUpperCase().slice(0, 64);
-
-    iterations = Number(sessionData['AUTH_PBKDF2_SDER_COUNT']);
-    let mixingSalt = Buffer.from(sessionData['AUTH_PBKDF2_CSK_SALT'], 'hex');
-    let partABKey = Buffer.concat([sessionKeyPartb.slice(0, keyLen), sessionKeyParta.slice(0, keyLen)]);
-    let partABKeyStr = partABKey.toString('hex').toUpperCase();
-    let partABKeyBuffer = Buffer.from(partABKeyStr, 'utf8');
-    authObj.comboKey = crypto.pbkdf2Sync(partABKeyBuffer, mixingSalt, iterations, keyLen, 'sha512');
+    const sessionKeyParta = this._decrypt(passwordHash, encodedServerKey);
+    const sessionKeyPartb = Buffer.alloc(sessionKeyParta.length);
+    crypto.randomFillSync(sessionKeyPartb);
+    const encodedClientKey = this._encrypt(passwordHash, sessionKeyPartb);
+
+    if (sessionKeyParta.length === 48) {
+      authObj.sessionKey = encodedClientKey.slice().toString('hex').toUpperCase().slice(0, 96);
+      const buf = Buffer.alloc(24);
+      for (let i = 16; i <= 40; i++) {
+        buf[i - 16] = sessionKeyParta[i] ^ sessionKeyPartb[i];
+      }
+      const part1 = crypto.createHash("md5").update(buf.subarray(0, 16)).digest();
+      const part2 = crypto.createHash("md5").update(buf.subarray(16)).digest();
+      authObj.comboKey = Buffer.concat([part1, part2]).slice(0, keyLen);
+    } else {
+      authObj.sessionKey = encodedClientKey.slice().toString('hex').toUpperCase().slice(0, 64);
+      const mixingSalt = Buffer.from(sessionData['AUTH_PBKDF2_CSK_SALT'], 'hex');
+      iterations = Number(sessionData['AUTH_PBKDF2_SDER_COUNT']);
+      const partABKey = Buffer.concat([sessionKeyPartb.slice(0, keyLen), sessionKeyParta.slice(0, keyLen)]);
+      const partABKeyStr = partABKey.toString('hex').toUpperCase();
+      const partABKeyBuffer = Buffer.from(partABKeyStr, 'utf8');
+      authObj.comboKey = crypto.pbkdf2Sync(partABKeyBuffer, mixingSalt,
+        iterations, keyLen, 'sha512');
+    }
 
     let salt = Buffer.alloc(16);
     if (!verifier11G) {

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

@@ -29,12 +29,11 @@
 const { Buffer } = require('buffer');
 const constants = require("../constants.js");
 const errors = require("../../../errors.js");
-const os = require("os");
 const process = require("process");
 const ED = require("../encryptDecrypt.js");
 const Message = require("./base.js");
 const util = require("../../util.js");
-
+const cInfo = util.CLIENT_INFO;
 const crypto = require('crypto');
 
 /**
@@ -184,11 +183,10 @@ class AuthMessage extends Message {
         buf.writeBytesWithLength(Buffer.from(this.username));
       }
       buf.writeKeyValue("AUTH_TERMINAL", "unknown");
-      buf.writeKeyValue("AUTH_PROGRAM_NM", process.argv0);
-      buf.writeKeyValue("AUTH_MACHINE", os.hostname());
-      buf.writeKeyValue("AUTH_PID", process.pid.toString());
-      buf.writeKeyValue("AUTH_SID", os.userInfo().username);
-
+      buf.writeKeyValue("AUTH_PROGRAM_NM", cInfo.program);
+      buf.writeKeyValue("AUTH_MACHINE", cInfo.hostName);
+      buf.writeKeyValue("AUTH_PID", cInfo.pid);
+      buf.writeKeyValue("AUTH_SID", cInfo.userName);
     } else {
       let numPairs = 0;
 
@@ -302,11 +300,11 @@ class AuthMessage extends Message {
     let numParams = buf.readUB2();
     for (let i = 0; i < numParams;i++) {
       buf.skipUB4();
-      let key = buf.readStr(constants.TNS_CS_IMPLICIT);
+      let key = buf.readStr(constants.CSFRM_IMPLICIT);
       let value = "";
       let numBytes = buf.readUB4();
       if (numBytes > 0) {
-        value = buf.readStr(constants.TNS_CS_IMPLICIT);
+        value = buf.readStr(constants.CSFRM_IMPLICIT);
       }
       let flag = buf.readUB4();
       if (key === "AUTH_VFR_DATA") {

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

@@ -149,7 +149,7 @@ class Message {
       for (let i = 0; i < numEntries; i++) {
         buf.skipUB2();                          // skip chunk length
 
-        this.errorInfo.batchErrors[i].message = buf.readStr(constants.TNS_CS_IMPLICIT);
+        this.errorInfo.batchErrors[i].message = buf.readStr(constants.CSFRM_IMPLICIT);
         buf.skipBytes(2);                       // ignore end marker
       }
     }
@@ -158,7 +158,7 @@ class Message {
     this.errorInfo.rowCount = buf.readUB8();    // row number (extended)
     if (this.errorInfo.num !== 0) {
       this.errorOccurred = true;
-      this.errorInfo.message = buf.readStr(constants.TNS_CS_IMPLICIT);
+      this.errorInfo.message = buf.readStr(constants.CSFRM_IMPLICIT);
       /*
        * Remove ending newline from ORA error message
        */
@@ -175,7 +175,7 @@ class Message {
     let numBytes = buf.readUB2();               // length of error message
     buf.skipUB2();                              // flags
     if (this.errorInfo.num != 0 && numBytes > 0) {
-      this.errorInfo.message = buf.readStr(constants.TNS_CS_IMPLICIT);
+      this.errorInfo.message = buf.readStr(constants.CSFRM_IMPLICIT);
     }
     this.errorInfo.isWarning = true;
   }
@@ -215,7 +215,7 @@ class Message {
     } else if (messageType === constants.TNS_MSG_TYPE_SERVER_SIDE_PIGGYBACK) {
       this.processServerSidePiggyBack(buf);
     } else {
-      errors.throwErr(errors.ERR_UNEXPECTED_MESSAGE_TYPE, messageType);
+      errors.throwErr(errors.ERR_UNEXPECTED_MESSAGE_TYPE, messageType, buf.pos, buf.packetNum);
     }
   }
 
@@ -230,8 +230,8 @@ class Message {
      || (opcode === constants.TNS_SERVER_PIGGYBACK_TRACE_EVENT)) {
       // pass
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_OS_PID_MTS) {
-      const nb = buf.readUB2();
-      buf.skipBytes(nb + 1);
+      buf.skipUB2();
+      buf.skipBytesChunked();
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_SYNC) {
       buf.skipUB2();                            // skip number of DTYs
       buf.skipUB1();                            // skip length of DTYs
@@ -240,11 +240,11 @@ class Message {
       for (let i = 0; i < num_elements; i++) {
         let temp16 = buf.readUB2();
         if (temp16 > 0) {                       // skip key
-          buf.skipBytes(temp16 + 1);
+          buf.skipBytesChunked();
         }
         temp16 = buf.readUB2();
         if (temp16 > 0) {                       // skip value
-          buf.skipBytes(temp16 + 1);
+          buf.skipBytesChunked();
         }
         buf.skipUB2();                          // skip flags
         buf.skipUB4();                          // skip overall flags
@@ -271,11 +271,11 @@ class Message {
         for (let i = 0; i < num_elements; ++i) {
           let temp16 = buf.readUB2();
           if (temp16 > 0) {                     // skip key
-            buf.skipBytes(temp16 + 1);
+            buf.skipBytesChunked();
           }
           temp16 = buf.readUB2();
           if (temp16 > 0) {                     // skip value
-            buf.skipBytes(temp16 + 1);
+            buf.skipBytesChunked();
           }
           buf.skipUB2();                        // skip flags
         }

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

@@ -77,21 +77,21 @@ class ExecuteMessage extends MessageWithData {
       dmlOptions = constants.TNS_EXEC_OPTION_IMPLICIT_RESULTSET;
       options |= constants.TNS_EXEC_OPTION_EXECUTE;
     }
-    if (stmt.cursorId == 0 || stmt.isDdl) {
+    if (stmt.cursorId === 0 || stmt.isDdl) {
       options |= constants.TNS_EXEC_OPTION_PARSE;
     }
     if (stmt.isQuery) {
       if (this.parseOnly) {
         options |= constants.TNS_EXEC_OPTION_DESCRIBE;
       } else {
-        if (this.options.prefetchRows > 0) {
-          options |= constants.TNS_EXEC_OPTION_FETCH;
-        }
         if (stmt.cursorId === 0 || stmt.requiresDefine) {
           numIters = this.options.prefetchRows;
         } else {
           numIters = this.options.fetchArraySize;
         }
+        if (numIters > 0 && !stmt.noPrefetch) {
+          options |= constants.TNS_EXEC_OPTION_FETCH;
+        }
       }
     }
     if (!stmt.isPlSql && !this.parseOnly) {
@@ -276,7 +276,7 @@ class ExecuteMessage extends MessageWithData {
     if (this.currentRow === 0) {
       let stmt = this.statement;
       if (stmt.cursorId !== 0 && !stmt.requiresFullExecute && !this.parseOnly && !stmt.requiresDefine && !stmt.isDdl && !this.batchErrors) {
-        if (stmt.isQuery && !stmt.requiresDefine && this.options.prefetchRows > 0) {
+        if (stmt.isQuery && !stmt.requiresDefine && !stmt.noPrefetch && this.options.prefetchRows > 0) {
           this.functionCode = constants.TNS_FUNC_REEXECUTE_AND_FETCH;
         } else {
           this.functionCode = constants.TNS_FUNC_REEXECUTE;

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

@@ -116,7 +116,7 @@ class LobOpMessage extends Message {
       buf.writeBytes(this.destLobImpl._locator);
     }
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
-      if (this.sourceLobImpl.dbType._csfrm === constants.TNS_CS_NCHAR) {
+      if (this.sourceLobImpl.dbType._csfrm === constants.CSFRM_NCHAR) {
         buf.caps.checkNCharsetId();
         buf.writeUB4(constants.TNS_CHARSET_UTF16);
       } else {
@@ -128,7 +128,7 @@ class LobOpMessage extends Message {
       buf.writeUInt8(constants.TNS_MSG_TYPE_LOB_DATA);
       if (this.sourceLobImpl.dbType._oraTypeNum === constants.TNS_DATA_TYPE_BLOB) {
         data = this.data;
-      } else if (this.sourceLobImpl.getCsfrm() === constants.TNS_CS_NCHAR) {
+      } else if (this.sourceLobImpl.getCsfrm() === constants.CSFRM_NCHAR) {
         data = this.data;
         // TODO: avoid conversion back to string, if possible
         // this is since bind data is converted to buffer automatically, but if
@@ -154,7 +154,7 @@ class LobOpMessage extends Message {
       if (data !== null) {
         if (oraTypeNum === constants.TNS_DATA_TYPE_BLOB) {
           data = Buffer.from(data);
-        } else if (this.sourceLobImpl.getCsfrm() === constants.TNS_CS_NCHAR) {
+        } else if (this.sourceLobImpl.getCsfrm() === constants.CSFRM_NCHAR) {
           data = Buffer.from(data).swap16().toString('utf16le');
         } else {
           data = data.toString();