oracledb 6.0.2 → 6.1.0

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;
@@ -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) {
@@ -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 && 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/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();

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,13 +149,16 @@ 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);
     }
 
     let numBytes = buf.readUB4();
     if (numBytes > 0) {
-      buf.skipBytes(numBytes + 1);              // current date
+      buf.skipBytesChunked();                   // current date
     }
     buf.skipUB4();                              // dcbflag
     buf.skipUB4();                              // dcbmdbz
@@ -147,7 +166,7 @@ class MessageWithData extends Message {
     buf.skipUB4();                              // dcbmxpr
     numBytes = buf.readUB4();
     if (numBytes > 0) {
-      buf.skipBytes(numBytes + 1);
+      buf.skipBytesChunked();
     }
 
     this.resultSetsToSetup.push(resultSet);
@@ -190,17 +209,17 @@ class MessageWithData extends Message {
     let name;
     numBytes = buf.readUB4();
     if (numBytes > 0) {
-      name = buf.readStr(constants.TNS_CS_IMPLICIT);
+      name = buf.readStr(constants.CSFRM_IMPLICIT);
     }
     let schema;
     numBytes = buf.readUB4();
     if (numBytes > 0) {
-      schema = buf.readStr(constants.TNS_CS_IMPLICIT);
+      schema = buf.readStr(constants.CSFRM_IMPLICIT);
     }
     numBytes = buf.readUB4();
     let typeName;
     if (numBytes > 0) {
-      typeName = buf.readStr(constants.TNS_CS_IMPLICIT);
+      typeName = buf.readStr(constants.CSFRM_IMPLICIT);
     }
     buf.skipUB2();                              // column position
     buf.skipUB4();                              // uds flag
@@ -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;
@@ -356,7 +374,7 @@ class MessageWithData extends Message {
       oraTypeNum === constants.TNS_DATA_TYPE_CHAR ||
       oraTypeNum === constants.TNS_DATA_TYPE_LONG
     ) {
-      if (csfrm === constants.TNS_CS_NCHAR) {
+      if (csfrm === constants.CSFRM_NCHAR) {
         buf.caps.checkNCharsetId();
       }
       colValue = buf.readStr(csfrm);
@@ -381,19 +399,19 @@ class MessageWithData extends Message {
       colValue = buf.readOracleDate(useLocalTime);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_ROWID) {
       if (!this.inFetch) {
-        colValue = buf.readStr(constants.TNS_CS_IMPLICIT);
+        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);
         }
       }
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_UROWID) {
       if (!this.inFetch) {
-        colValue = buf.readStr(constants.TNS_CS_IMPLICIT);
+        colValue = buf.readStr(constants.CSFRM_IMPLICIT);
       } else {
         colValue = buf.readURowID();
       }
@@ -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();
@@ -479,7 +497,7 @@ class MessageWithData extends Message {
     for (let i = 0; i < numParams; i++) {
       numBytes = buf.readUB2();                 // key
       if (numBytes > 0) {
-        keyTextValue = buf.readStr(constants.TNS_CS_IMPLICIT);
+        keyTextValue = buf.readStr(constants.CSFRM_IMPLICIT);
       }
       numBytes = buf.readUB2();                 // value
       if (numBytes > 0) {
@@ -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,7 +554,10 @@ class MessageWithData extends Message {
             variable.type = variable.fetchInfo.fetchType;
             variable.maxSize = constants.TNS_MAX_LONG_LENGTH;
           }
-          resultSet.statement.requiresDefine = true;
+          if (!resultSet.statement.noPrefetch) {
+            resultSet.statement.requiresDefine = true;
+            resultSet.statement.noPrefetch = true;
+          }
         }
       }
     }
@@ -579,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));
   }
 
@@ -608,7 +615,7 @@ class MessageWithData extends Message {
       // NCHAR, NVARCHAR reports ORA-01460: unimplemented or unreasonable
       // conversion requested if maxSize is not multiplied by the
       // bufferSizeFactor
-      if (variable.type._csfrm === constants.TNS_CS_NCHAR) {
+      if (variable.type._csfrm === constants.CSFRM_NCHAR) {
         maxSize *= variable.type._bufferSizeFactor;
       }
       if ([constants.TNS_DATA_TYPE_ROWID, constants.TNS_DATA_TYPE_UROWID].includes(oraTypeNum)) {
@@ -650,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)
@@ -669,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]);
@@ -732,7 +739,7 @@ class MessageWithData extends Message {
       oraTypeNum === constants.TNS_DATA_TYPE_LONG ||
       oraTypeNum === constants.TNS_DATA_TYPE_RAW ||
       oraTypeNum === constants.TNS_DATA_TYPE_LONG_RAW) {
-      if (variable.type._csfrm === constants.TNS_CS_NCHAR) {
+      if (variable.type._csfrm === constants.CSFRM_NCHAR) {
         buf.caps.checkNCharsetId();
         value = Buffer.from(value, constants.TNS_ENCODING_UTF16).swap16();
       } else {
@@ -799,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 {

package/lib/thin/protocol/packet.js

@@ -31,6 +31,7 @@ const { Buffer } = require('buffer');
 const constants = require("./constants.js");
 const oson = require('./oson.js');
 const utils = require('./utils.js');
+const errors = require("../../errors.js");
 
 const TNS_BASE64_ALPHABET_ARRAY = Buffer.from("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 'utf8');
 
@@ -254,46 +255,48 @@ class ReadPacket extends BaseBuffer {
    * Receives a packet from the adapter.
    */
   receivePacket() {
-    if (this.savedBufferPos === this.savedBuffers.length) {
+    if (this.savedPacketPos === this.savedPackets.length) {
       const packet = this.nsi.syncRecvPacket();
-      if (!packet)
+      if (!packet || this.nsi.isBreak)
         throw new utils.OutOfPacketsError();
-      this.savedBuffers.push(packet.buf);
+      this.savedPackets.push(packet);
     }
-    this.startPacket(this.savedBuffers[this.savedBufferPos++]);
+    this.startPacket(this.savedPackets[this.savedPacketPos++]);
   }
 
   restorePoint() {
-    this.savedBufferPos = 0;
-    this.startPacket(this.savedBuffers[this.savedBufferPos++]);
+    this.savedPacketPos = 0;
+    this.startPacket(this.savedPackets[this.savedPacketPos++]);
     this.pos = this.savedPos;
   }
 
   savePoint() {
-    if (this.savedBuffers) {
-      this.savedBuffers = this.savedBuffers.splice(this.savedBufferPos - 1);
+    if (this.savedPackets) {
+      this.savedPackets = this.savedPackets.splice(this.savedPacketPos - 1);
     } else {
-      this.savedBuffers = [this.buf];
+      this.savedPackets = [this.packet];
     }
-    this.savedBufferPos = 1;
+    this.savedPacketPos = 1;
     this.savedPos = this.pos;
   }
 
-  startPacket(buf) {
-    this.buf = buf;
+  startPacket(packet) {
+    this.packet = packet;
+    this.buf = packet.buf;
     this.pos = 10;                      // skip packet heaader and data flags
-    this.size = buf.length;
+    this.size = packet.buf.length;
+    this.packetNum = packet.num;
   }
 
   async waitForPackets() {
     const packet = await this.nsi.recvPacket();
-    if (!this.savedBuffers) {
-      this.savedBuffers = [packet.buf];
-      this.savedBufferPos = 0;
+    if (!this.savedPackets) {
+      this.savedPackets = [packet];
+      this.savedPacketPos = 0;
     } else {
-      this.savedBuffers.push(packet.buf);
+      this.savedPackets.push(packet);
     }
-    this.startPacket(this.savedBuffers[this.savedBufferPos++]);
+    this.startPacket(this.savedPackets[this.savedPacketPos++]);
   }
 
   /**
@@ -322,23 +325,23 @@ class ReadPacket extends BaseBuffer {
 
     // Handle physical rowid
     if (buf && buf[0] === 1) {
-      let rba = buf.readUInt32BE(1);
-      let partitionID = buf.readUInt16BE(5);
-      let blockNum = buf.readUInt32BE(7);
-      let slotNum = buf.readUInt16BE(11);
+      const rba = buf.readUInt32BE(1);
+      const partitionID = buf.readUInt16BE(5);
+      const blockNum = buf.readUInt32BE(7);
+      const slotNum = buf.readUInt16BE(11);
       return utils.encodeRowID({rba, partitionID, blockNum, slotNum});
     }
 
     // handle logical rowid
     let outputLen = Math.floor(inputLen / 3) * 4;
-    let remainder = inputLen % 3;
+    const remainder = inputLen % 3;
     if (remainder === 1) {
       outputLen += 1;
     } else if (remainder === 2) {
       outputLen += 3;
     }
 
-    let outputValue =  Buffer.alloc(outputLen);
+    const outputValue =  Buffer.alloc(outputLen);
     inputLen -= 1;
     outputValue[0] = 42;
     outputOffset += 1;
@@ -383,16 +386,19 @@ class ReadPacket extends BaseBuffer {
   }
 
   readRowID() {
-    let rba = this.readUB4();
-    let partitionID = this.readUB2();
+    const rba = this.readUB4();
+    const partitionID = this.readUB2();
     this.skipUB1();
-    let blockNum = this.readUB4();
-    let slotNum = this.readUB2();
+    const blockNum = this.readUB4();
+    const slotNum = this.readUB2();
     return {rba, partitionID, blockNum, slotNum};
   }
 
   skipBytesChunked() {
     const numBytes = this.readUInt8();
+    if (numBytes === 0 || numBytes === constants.TNS_NULL_LENGTH_INDICATOR) {
+      return;
+    }
     if (numBytes !== constants.TNS_LONG_LENGTH_INDICATOR) {
       this.skipBytes(numBytes);
     } else {
@@ -405,6 +411,23 @@ class ReadPacket extends BaseBuffer {
     }
   }
 
+  readNullTerminatedBytes(maxSize = 50) {
+    let offset = 0;
+    const tmp = Buffer.allocUnsafe(maxSize);
+    while (offset < maxSize) {
+      tmp[offset] = this.readUInt8();
+      if (tmp[offset] === 0) {
+        break;
+      }
+      offset = offset + 1;
+    }
+    if (offset === maxSize) {
+      const reason = `Byte Arrray Exceeded MaxSize ${maxSize}`;
+      errors.throwErr(errors.ERR_INTERNAL, reason);
+    }
+    return tmp.subarray(0, offset + 1);
+  }
+
 }