oracledb 6.0.3 → 6.1.0

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

@@ -30,37 +30,13 @@ const { Buffer } = require('buffer');
 const constants = require("../constants.js");
 const errors = require("../../../errors.js");
 
-class OracleErrorInfo {
-  constructor() {
-    this.num = 0;
-    this.cursorId = 0;
-    this.pos = 0;
-    this.rowCount = 0;
-    this.message = "";
-    this.rowID = null;
-    this.batchErrors;
-  }
-}
-
-class Error {
-  constructor(num, message = "", context = "", isRecoverable = false, isWarning = false, code = 0, offset = 0) {
-    this.num = num;
-    this.message = message;
-    this.context = context;
-    this.isRecoverable = isRecoverable;
-    this.isWarning = isWarning;
-    this.code = code;
-    this.offset = offset;
-  }
-}
-
 /**
  *
  * Base class for all the RPC messages to support encode/decode functions
  */
 class Message {
   constructor(connection) {
-    this.errorInfo = new OracleErrorInfo();
+    this.errorInfo = {};
     this.connection = connection;
     this.messageType = constants.TNS_MSG_TYPE_FUNCTION;
     this.functionCode = 0;
@@ -106,7 +82,7 @@ class Message {
     buf.skipUB1();                              // call number
     buf.skipUB2();                              // padding
     buf.skipUB4();                              // success iters
-    let numBytes = buf.readUB4();               // oerrdd (logical rowid)
+    const numBytes = buf.readUB4();               // oerrdd (logical rowid)
     if (numBytes > 0) {
       buf.skipBytesChunked();
     }
@@ -114,12 +90,12 @@ class Message {
     let numEntries = buf.readUB2();             // batch error codes array
     if (numEntries > 0) {
       this.errorInfo.batchErrors = [];
-      let firstByte = buf.readUInt8();
+      const firstByte = buf.readUInt8();
       for (let i = 0; i < numEntries; i++) {
         if (firstByte === constants.TNS_LONG_LENGTH_INDICATOR) {
           buf.skipUB4();                        // chunk length ignored
         }
-        let errorCode = buf.readUB2();
+        const errorCode = buf.readUB2();
         this.errorInfo.batchErrors.push(new Error(errorCode));
       }
       if (firstByte === constants.TNS_LONG_LENGTH_INDICATOR) {
@@ -130,7 +106,7 @@ class Message {
     // batch error offset
     numEntries = buf.readUB2();                 // batch error row offset array
     if (numEntries > 0) {
-      let firstByte = buf.readUInt8();
+      const firstByte = buf.readUInt8();
       for (let i = 0; i < numEntries; i++) {
         if (firstByte === constants.TNS_LONG_LENGTH_INDICATOR) {
           buf.skipUB4();                        // chunk length ignored
@@ -172,7 +148,7 @@ class Message {
 
   processWarningInfo(buf) {
     this.errorInfo.num = buf.readUB2();         // error number
-    let numBytes = buf.readUB2();               // length of error message
+    const numBytes = buf.readUB2();               // length of error message
     buf.skipUB2();                              // flags
     if (this.errorInfo.num != 0 && numBytes > 0) {
       this.errorInfo.message = buf.readStr(constants.CSFRM_IMPLICIT);
@@ -224,18 +200,19 @@ class Message {
     if (opcode === constants.TNS_SERVER_PIGGYBACK_LTXID) {
       const num_bytes = buf.readUB4();
       if (num_bytes > 0) {
-        buf.skipBytes(num_bytes);
+        buf.skipBytesChunked();
       }
     } else if ((opcode === constants.TNS_SERVER_PIGGYBACK_QUERY_CACHE_INVALIDATION)
      || (opcode === constants.TNS_SERVER_PIGGYBACK_TRACE_EVENT)) {
       // pass
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_OS_PID_MTS) {
-      buf.skipUB2();
-      buf.skipBytesChunked();
+      const numDtys = buf.readUB2();
+      buf.skipUB1();
+      buf.skipBytes(numDtys);
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_SYNC) {
       buf.skipUB2();                            // skip number of DTYs
       buf.skipUB1();                            // skip length of DTYs
-      const num_elements = buf.readUB2();
+      const num_elements = buf.readUB4();
       buf.skipBytes(1);                         // skip length
       for (let i = 0; i < num_elements; i++) {
         let temp16 = buf.readUB2();
@@ -247,20 +224,20 @@ class Message {
           buf.skipBytesChunked();
         }
         buf.skipUB2();                          // skip flags
-        buf.skipUB4();                          // skip overall flags
       }
+      buf.skipUB4();                            // skip overall flags
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_EXT_SYNC) {
       buf.skipUB2();
       buf.skipUB1();
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_AC_REPLAY_CONTEXT) {
       buf.skipUB2();                            // skip number of DTYs
-      buf.skipUB1(1);                           // skip length of DTYs
+      buf.skipUB1();                            // skip length of DTYs
       buf.skipUB4();                            // skip flags
       buf.skipUB4();                            // skip error code
       buf.skipUB1();                            // skip queue
       const num_bytes = buf.readUB4();          // skip replay context
       if (num_bytes > 0) {
-        buf.skipBytes(num_bytes);
+        buf.skipBytesChunked();
       }
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_SESS_RET) {
       buf.skipUB2();
@@ -283,7 +260,7 @@ class Message {
       const flags = buf.readUB4();              // session flags
       if (flags & constants.TNS_SESSGET_SESSION_CHANGED) {
         if (this.connection._drcpEstablishSession) {
-          this.connection.resetStatmentCache();
+          this.connection.resetStatementCache();
         }
       }
       this.connection._drcpEstablishSession = false;
@@ -335,8 +312,8 @@ class Message {
   }
 
   writeCloseTempLobsPiggyback(buf) {
-    let lobsToClose = this.connection._tempLobsToClose;
-    let opCode = constants.TNS_LOB_OP_FREE_TEMP | constants.TNS_LOB_OP_ARRAY;
+    const lobsToClose = this.connection._tempLobsToClose;
+    const opCode = constants.TNS_LOB_OP_FREE_TEMP | constants.TNS_LOB_OP_ARRAY;
 
     this.writePiggybackHeader(buf, constants.TNS_FUNC_LOB_OP);
 
@@ -406,9 +383,9 @@ class Message {
     buf.writeUInt8(0);                  // pointer (cidser)
     buf.writeUB4(flags);
 
-    let clientIdentifierBytes = this.writeEndEndTraceValue(buf, this.connection._clientIdentifier, this.connection._clientIdentifierModified);
-    let moduleBytes = this.writeEndEndTraceValue(buf, this.connection._module, this.connection._moduleModified);
-    let actionBytes = this.writeEndEndTraceValue(buf, this.connection._action, this.connection._actionModified);
+    const clientIdentifierBytes = this.writeEndEndTraceValue(buf, this.connection._clientIdentifier, this.connection._clientIdentifierModified);
+    const moduleBytes = this.writeEndEndTraceValue(buf, this.connection._module, this.connection._moduleModified);
+    const actionBytes = this.writeEndEndTraceValue(buf, this.connection._action, this.connection._actionModified);
 
     // write unsupported bits
     buf.writeUInt8(0);                  // pointer (cideci)
@@ -416,13 +393,13 @@ class Message {
     buf.writeUInt8(0);                  // cidcct
     buf.writeUB4(0);                    // cidecs
 
-    let clientInfoBytes = this.writeEndEndTraceValue(buf, this.connection._clientInfo, this.connection._clientInfoModified);
+    const clientInfoBytes = this.writeEndEndTraceValue(buf, this.connection._clientInfo, this.connection._clientInfoModified);
     // write unsupported bits
     buf.writeUInt8(0);                  // pointer (cideci)
     buf.writeUB4(0);                    // length (cideci)
     buf.writeUInt8(0);                  // cidcct
     buf.writeUB4(0);                    // cidecs
-    let dbOpBytes = this.writeEndEndTraceValue(buf, this.connection._dbOp, this.connection._dbOpModified);
+    const dbOpBytes = this.writeEndEndTraceValue(buf, this.connection._dbOp, this.connection._dbOpModified);
 
     // write strings
     if (this.connection._clientIdentifierModified && this.connection._clientIdentifier) {

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

@@ -0,0 +1,76 @@
+// Copyright (c) 2023 Oracle and/or its affiliates.
+
+//-----------------------------------------------------------------------------
+//
+// This software is dual-licensed to you under the Universal Permissive License
+// (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License
+// 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose
+// either license.
+//
+// If you elect to accept the software under the Apache License, Version 2.0,
+// the following applies:
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//-----------------------------------------------------------------------------
+
+'use strict';
+
+const constants = require("../constants.js");
+const Message = require("./base.js");
+
+/**
+ * Executes a Fast Negotiation RPC function.
+ * It sends Protocol Negotiation, Cookie Message, Datatype Negotiation
+ * and OSESS Key RPC in single round trip.
+ *
+ * @class ConnectionCookieMessage
+ * @extends {Message}
+ */
+class ConnectionCookieMessage extends Message {
+
+  /**
+   * Serializes the ConnectionCookieMessage function arguments
+   *
+   * @param {object} buf input arguments
+   */
+  encode(buf) {
+    this.protocolMessage.encode(buf);
+    buf.writeUInt8(constants.TNS_MSG_TYPE_COOKIE);
+    buf.writeUInt8(1);                  // cookie version
+    buf.writeUInt8(this.cookie.protocolVersion);
+    buf.writeUInt16LE(this.cookie.charsetID);
+    buf.writeUInt8(this.cookie.flags);
+    buf.writeUInt16LE(this.cookie.ncharsetID);
+    buf.writeBytesWithLength(this.cookie.serverBanner);
+    buf.writeBytesWithLength(this.cookie.compileCaps);
+    buf.writeBytesWithLength(this.cookie.runtimeCaps);
+    this.dataTypeMessage.encode(buf);
+    this.authMessage.encode(buf);
+  }
+
+  processMessage(buf, messageType) {
+    if (messageType === constants.TNS_MSG_TYPE_RENEGOTIATE) {
+      this.cookie.populated = false;
+    } else if (messageType === constants.TNS_MSG_TYPE_PROTOCOL) {
+      this.protocolMessage.processMessage(buf, messageType);
+    } else if (messageType === constants.TNS_MSG_TYPE_DATA_TYPES) {
+      this.dataTypeMessage.processMessage(buf, messageType);
+    } else {
+      this.authMessage.processMessage(buf, messageType);
+    }
+  }
+
+}
+
+module.exports = ConnectionCookieMessage;

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

@@ -38,14 +38,18 @@ const Message = require("./base.js");
  */
 class DataTypeMessage extends Message {
 
-  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);
+  processMessage(buf, messageType) {
+    if (messageType === constants.TNS_MSG_TYPE_DATA_TYPES) {
+      while (true) {        // eslint-disable-line
+        const dataType = buf.readUInt16BE();
+        if (dataType === 0)
+          break;
+        const convDataType = buf.readUInt16BE();
+        if (convDataType !== 0)
+          buf.skipBytes(4);
+      }
+    } else {
+      super.processMessage(buf, messageType);
     }
   }
 
@@ -57,7 +61,7 @@ class DataTypeMessage extends Message {
       constants.TNS_ENCODING_CONV_LENGTH);
     buf.writeBytesWithLength(buf.caps.compileCaps);
     buf.writeBytesWithLength(buf.caps.runtimeCaps);
-    for (let val of dataTypes) {
+    for (const val of dataTypes) {
       buf.writeUInt16BE(val[0]);
       buf.writeUInt16BE(val[1]);
       buf.writeUInt16BE(val[2]);

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

@@ -65,8 +65,8 @@ class ExecuteMessage extends MessageWithData {
     let numParams = 0;
     let numIters = 1;
     // Configuring the options field thats send to the server
-    let stmt = this.statement;
-    let params = stmt.bindInfoList;
+    const stmt = this.statement;
+    const params = stmt.bindInfoList;
 
     if (!stmt.requiresDefine && !this.parseOnly && params) {
       numParams = params.length;
@@ -223,7 +223,7 @@ class ExecuteMessage extends MessageWithData {
   // Write the message header for a re-execute and return the bind parameters.
   //-------------------------------------------------------------------------
   writeReExecuteMessage(buf) {
-    let stmt = this.statement;
+    const stmt = this.statement;
     let params = stmt.bindInfoList;
     let execFlag1 = 0, execFlag2 = 0, numIters;
     if (params !== undefined) {
@@ -236,7 +236,7 @@ class ExecuteMessage extends MessageWithData {
         });
       }
 
-      let tmpparams = [];
+      const tmpparams = [];
       params.forEach(info => {
         if (info.bindDir !== constants.TNS_BIND_DIR_OUTPUT && !info.isReturnBind) {
           tmpparams.push(info);
@@ -274,9 +274,9 @@ 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 && !this.parseOnly && !stmt.requiresDefine && !stmt.isDdl && !this.batchErrors) {
-        if (stmt.isQuery && !stmt.requiresDefine && !stmt.noPrefetch && this.options.prefetchRows > 0) {
+      const stmt = this.statement;
+      if (stmt.cursorId !== 0 && !stmt.requiresFullExecute && !this.parseOnly && !stmt.requiresDefine && !stmt.noPrefetch && !stmt.isDdl && !this.batchErrors) {
+        if (stmt.isQuery && this.options.prefetchRows > 0) {
           this.functionCode = constants.TNS_FUNC_REEXECUTE_AND_FETCH;
         } else {
           this.functionCode = constants.TNS_FUNC_REEXECUTE;

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

@@ -37,10 +37,12 @@ const PingMessage = require('./ping.js');
 const ProtocolMessage = require('./protocol.js');
 const RollbackMessage = require('./rollback.js');
 const SessionReleaseMessage = require('./sessionRelease.js');
+const ConnectionCookieMessage = require('./connectionCookie.js');
 
 module.exports = {
   AuthMessage,
   CommitMessage,
+  ConnectionCookieMessage,
   DataTypeMessage,
   ExecuteMessage,
   FetchMessage,

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

@@ -50,26 +50,37 @@ class ProtocolMessage extends Message {
     buf.writeUInt8(0);
   }
 
-  decode(buf) {
-    let message_type = buf.readUInt8();
-    if (message_type === constants.TNS_MSG_TYPE_PROTOCOL) {
-      buf.skipBytes(2);                         // skip protocol array
-      let x = buf.readUInt8();
-      while (x !== 0) {                         // skip server banner
-        x = buf.readUInt8();
-      }
-      buf.skipBytes(2);                         // character set ID
-      buf.skipUB1(1);                           // skip server flags
-      let num_elem = buf.readUInt16LE();
-      if (num_elem > 0) {                       // skip elements
-        buf.skipBytes(num_elem * 5);
-      }
-      let fdoLen = buf.readUInt16BE();
-      let fdo = buf.readBytes(fdoLen);
-      let ix = 6 + fdo[5] + fdo[6];
-      buf.caps.nCharsetId = (fdo[ix + 3] << 8) + fdo[ix + 4];
-      buf.caps.adjustForServerCompileCaps(buf.readBytesWithLength());
-      buf.caps.adjustForServerRuntimeCaps(buf.readBytesWithLength());
+  processMessage(buf, messageType) {
+    if (messageType === constants.TNS_MSG_TYPE_PROTOCOL) {
+      this.processProtocolInfo(buf);
+    } else {
+      super.processMessage(buf, messageType);
+    }
+  }
+
+  processProtocolInfo(buf) {
+    this.serverVersion = buf.readUInt8();
+    buf.skipUB1();
+    this.serverBanner = buf.readNullTerminatedBytes(48);
+    buf.caps.charSetID = buf.readUInt16LE();
+    this.serverFlags = buf.readUInt8();
+    const num_elem = buf.readUInt16LE();
+    if (num_elem > 0) {                       // skip elements
+      buf.skipBytes(num_elem * 5);
+    }
+    const fdoLen = buf.readUInt16BE();
+    const fdo = buf.readBytes(fdoLen);
+    const ix = 6 + fdo[5] + fdo[6];
+    buf.caps.nCharsetId = (fdo[ix + 3] << 8) + fdo[ix + 4];
+    const serverCompileCaps = buf.readBytesWithLength();
+    if (serverCompileCaps) {
+      this.serverCompileCaps = Buffer.from(serverCompileCaps);
+      buf.caps.adjustForServerCompileCaps(this.serverCompileCaps);
+    }
+    const serverRunTimeCaps = buf.readBytesWithLength();
+    if (serverRunTimeCaps) {
+      this.serverRunTimeCaps = Buffer.from(serverRunTimeCaps);
+      buf.caps.adjustForServerRuntimeCaps(this.serverRunTimeCaps);
     }
   }
 

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

@@ -65,11 +65,12 @@ class MessageWithData extends Message {
   processMessage(buf, messageType) {
     if (messageType === constants.TNS_MSG_TYPE_DESCRIBE_INFO) {
       buf.skipBytesChunked();
+      const prevQueryVars = this.statement.queryVars;
       this.statement.queryVars = [];
       this.statement.numQueryVars = 0;
       this.statement.bufferRowCount = 0;
       this.statement.bufferRowIndex = 0;
-      this.processDescribeInfo(buf, this.resultSet);
+      this.processDescribeInfo(buf, this.resultSet, prevQueryVars);
       this.outVariables = this.statement.queryVars;
     } else if (messageType === constants.TNS_MSG_TYPE_ROW_HEADER) {
       this.processRowHeader(buf);
@@ -123,7 +124,22 @@ class MessageWithData extends Message {
     }
   }
 
-  processDescribeInfo(buf, resultSet) {
+  //---------------------------------------------------------------------------
+  // If we have fetched this column earlier, we set that
+  // fetch type for the describe info variable received
+  // assuming the returned column order is same as previous.
+  //---------------------------------------------------------------------------
+  _adjustFetchType(pVar, cVar) {
+    if ((cVar.fetchInfo.dbType._oraTypeNum === constants.TNS_DATA_TYPE_CLOB
+       && pVar.fetchInfo.fetchType._oraTypeNum === constants.TNS_DATA_TYPE_LONG)
+        || (cVar.fetchInfo.dbType._oraTypeNum === constants.TNS_DATA_TYPE_BLOB
+          && pVar.fetchInfo.fetchType._oraTypeNum === constants.TNS_DATA_TYPE_LONG_RAW)) {
+      cVar.type = pVar.fetchInfo.fetchType;
+      cVar.maxSize = pVar.maxSize;
+    }
+  }
+
+  processDescribeInfo(buf, resultSet, prevQueryVars) {
     const statement = resultSet.statement;
     buf.skipUB4();                              // max row size
     statement.numQueryVars = buf.readUB4();
@@ -133,6 +149,9 @@ class MessageWithData extends Message {
     resultSet.metadata = [];
     for (let i = 0; i < statement.numQueryVars; i++) {
       const variable = this.processColumnInfo(buf, i + 1);
+      if (prevQueryVars && i < prevQueryVars.length) {
+        this._adjustFetchType(prevQueryVars[i], variable);
+      }
       statement.queryVars.push(variable);
       resultSet.metadata.push(variable.fetchInfo);
     }
@@ -257,8 +276,7 @@ class MessageWithData extends Message {
     buf.skipUB2();                              // buffer length
     let numBytes = buf.readUB4();
     if (numBytes > 0) {
-      buf.skipUB1();                            // skip repeated length
-      this.getBitVector(buf, numBytes);
+      this.bitVector = Buffer.from(buf.readBytesWithLength());
     }
     numBytes = buf.readUB4();
     if (numBytes > 0) {
@@ -267,28 +285,28 @@ class MessageWithData extends Message {
   }
 
   isDuplicateData(columnName) {
-    if (this.bitVector === null || this.bitVector === undefined) {
+    if (!this.bitVector) {
       return false;
     }
-    let byteNum = Math.floor(columnName / 8);
-    let bitNum = columnName % 8;
+    const byteNum = Math.floor(columnName / 8);
+    const bitNum = columnName % 8;
     return (this.bitVector[byteNum] & (1 << bitNum)) === 0;
   }
 
   processRowData(buf) {
     let value;
-    for (let [col, variable] of this.outVariables.entries()) {
+    for (const [col, variable] of this.outVariables.entries()) {
       if (variable.isArray) {
         variable.numElementsInArray = buf.readUB4();
-        let values = new Array(variable.numElementsInArray).fill(null);
+        const values = new Array(variable.numElementsInArray).fill(null);
         for (let pos = 0; pos < variable.numElementsInArray; pos++) {
           value = this.processColumnData(buf, variable, pos);
           values[pos] = value;
         }
         variable.values[this.rowIndex] = values;
       } else if (this.statement.isReturning) {
-        let numRows = buf.readUB4();
-        let values = Array(numRows).fill(null);
+        const numRows = buf.readUB4();
+        const values = Array(numRows).fill(null);
         for (let j = 0; j < numRows; j++) {
           values[j] = this.processColumnData(buf, variable, j);
         }
@@ -331,7 +349,7 @@ class MessageWithData extends Message {
     }
     this.outVariables = [];
     for (let i = 0; i < numBinds; i++) {              // bind directions
-      let bindInfo = this.statement.bindInfoList[i];
+      const bindInfo = this.statement.bindInfoList[i];
       bindInfo.bindDir = buf.readUInt8();
       if (bindInfo.bindDir === constants.TNS_BIND_DIR_INPUT) {
         continue;
@@ -383,11 +401,11 @@ class MessageWithData extends Message {
       if (!this.inFetch) {
         colValue = buf.readStr(constants.CSFRM_IMPLICIT);
       } else {
-        let numBytes = buf.readUInt8();
+        const numBytes = buf.readUInt8();
         if (isNullLength(numBytes)) {
           colValue = null;
         } else {
-          let rowid = buf.readRowID();
+          const rowid = buf.readRowID();
           colValue = utils.encodeRowID(rowid);
         }
       }
@@ -406,7 +424,7 @@ class MessageWithData extends Message {
       if (colValue !== null)
         colValue = parseFloat(colValue);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_CURSOR) {
-      let numBytes = buf.readUInt8();
+      const numBytes = buf.readUInt8();
       if (isNullLength(numBytes)) {
         colValue = null;
       } else {
@@ -425,7 +443,7 @@ class MessageWithData extends Message {
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_BOOLEAN) {
       colValue = buf.readBool();
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_CLOB || oraTypeNum === constants.TNS_DATA_TYPE_BLOB) {
-      let bvalue = buf.readUB4();
+      const bvalue = buf.readUB4();
       if (bvalue > 0) { // Non Null data in column
         colValue = new ThinLobImpl();
         const length = buf.readUB8();
@@ -497,25 +515,15 @@ class MessageWithData extends Message {
       buf.skip(numBytes);
     }
     if (this.arrayDmlRowCounts) {
-      let numRows = buf.readUB4();
-      let rowCounts = this.options.dmlRowCounts = [];
+      const numRows = buf.readUB4();
+      const rowCounts = this.options.dmlRowCounts = [];
       for (let i = 0; i < numRows; i++) {
-        let rowCount = buf.readUB8();
+        const rowCount = buf.readUB8();
         rowCounts.push(rowCount);
       }
     }
   }
 
-  process(buf) {
-    this.bitVector = this.savedBitVector;
-    super.process(buf);
-  }
-
-  savePoint(buf) {
-    this.savedBitVector = this.bitVector;
-    super.savePoint(buf);
-  }
-
   async postProcess() {
     if (this.outVariables) {
       for (const variable of this.outVariables) {
@@ -546,8 +554,10 @@ class MessageWithData extends Message {
             variable.type = variable.fetchInfo.fetchType;
             variable.maxSize = constants.TNS_MAX_LONG_LENGTH;
           }
-          resultSet.statement.requiresDefine = true;
-          resultSet.statement.noPrefetch = true;
+          if (!resultSet.statement.noPrefetch) {
+            resultSet.statement.requiresDefine = true;
+            resultSet.statement.noPrefetch = true;
+          }
         }
       }
     }
@@ -580,10 +590,6 @@ class MessageWithData extends Message {
     if (this.statement.numQueryVars % 8 > 0) {
       numBytes += 1;
     }
-    this.getBitVector(buf, numBytes);
-  }
-
-  getBitVector(buf, numBytes) {
     this.bitVector = Buffer.from(buf.readBytes(numBytes));
   }
 
@@ -651,15 +657,15 @@ class MessageWithData extends Message {
         const objType = variable.objType;
         buf.writeUB4(objType.oid.length);
         buf.writeBytesWithLength(objType.oid);
-        buf.writeUB4(objType.version);
+        buf.writeUB2(objType.version);
       } else {
         buf.writeUB4(0);                        // OID
-        buf.writeUB4(0);                        // version
+        buf.writeUB2(0);                        // version
       }
       if (variable.type._csfrm !== 0) {
-        buf.writeUB4(constants.TNS_CHARSET_UTF8);
+        buf.writeUB2(constants.TNS_CHARSET_UTF8);
       } else {
-        buf.writeUB4(0);
+        buf.writeUB2(0);
       }
       buf.writeUInt8(variable.type._csfrm);
       buf.writeUB4(lobPrefetchLength);          // max chars (LOB prefetch)
@@ -670,14 +676,14 @@ class MessageWithData extends Message {
   }
 
   writeBindParamsRow(buf, params, pos) {
-    let offset = this.offset;
+    const offset = this.offset;
     let foundLong = false;
     for (const bindInfo of params) {
       if (bindInfo.isReturnBind)
         continue;
-      let variable = bindInfo.bindVar;
+      const variable = bindInfo.bindVar;
       if (variable.isArray) {
-        let numElements = variable.values.length;
+        const numElements = variable.values.length;
         buf.writeUB4(numElements);
         for (let i = 0; i < numElements; i++) {
           this.writeBindParamsColumn(buf, variable, variable.values[i]);
@@ -800,7 +806,7 @@ class MessageWithData extends Message {
     for (let i = 0; i < numResults; i++) {
       const numBytes = buf.readUInt8();
       buf.skipBytes(numBytes);
-      let childResultSet = this.createCursorFromDescribe(buf);
+      const childResultSet = this.createCursorFromDescribe(buf);
       childResultSet.statement.cursorId = buf.readUB2();
       this.options.implicitResultSet.push(childResultSet);
     }

package/lib/thin/protocol/oson.js

@@ -352,7 +352,7 @@ class OsonFieldNamesSegment extends GrowableBuffer {
   //---------------------------------------------------------------------------
   _examineNode(value) {
     if (Array.isArray(value)) {
-      for (let element of value) {
+      for (const element of value) {
         this._examineNode(element);
       }
     } else if (value && Array.isArray(value.fields)) {
@@ -418,7 +418,7 @@ class OsonTreeSegment extends GrowableBuffer {
     this._encodeContainer(constants.TNS_JSON_TYPE_ARRAY, value.length);
     let offsetsBufPos = 0;
     const offsetsBuf = this.reserveBytes(value.length * 4);
-    for (let element of value) {
+    for (const element of value) {
       offsetsBuf.writeUInt32BE(this.pos, offsetsBufPos);
       offsetsBufPos += 4;
       this.encodeNode(element, fnamesSeg);
@@ -627,12 +627,12 @@ class OsonEncoder extends GrowableBuffer {
       this.writeUInt16BE(0);
 
       // write array of hash ids
-      for (let fieldName of fnamesSeg.fieldNames) {
+      for (const fieldName of fnamesSeg.fieldNames) {
         this.writeUInt8(fieldName.hashId);
       }
 
       // write array of field name offsets
-      for (let fieldName of fnamesSeg.fieldNames) {
+      for (const fieldName of fnamesSeg.fieldNames) {
         if (fnamesSeg.pos < 65536) {
           this.writeUInt16BE(fieldName.offset);
         } else {