Fix for Issues #1565 and #1566 and Improved Database Object support in Thin mode

Author: sharadraju

doc/src/release_notes.rst

@@ -12,10 +12,15 @@ Thin Mode Changes
 +++++++++++++++++
 
 #)  Fixed bug when fetching rows containing data duplicated from a previous
-    row that spans multiple packets.
+    row that spans multiple network packets.
     `Issue #1566 <https://github.com/oracle/node-oracledb/issues/1566>`__ and
     `Issue #1565 <https://github.com/oracle/node-oracledb/issues/1565>`__.
 
+#)  Fixed bug when fetching database objects with large embedded database
+    objects.
+
+#)  Fixed bug when fetching a large number of database objects.
+
 
 node-oracledb `v6.0.1 <https://github.com/oracle/node-oracledb/compare/v6.0.0...v6.0.1>`__ (07 Jun 2023)
 --------------------------------------------------------------------------------------------------------

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()
   //
@@ -354,7 +367,7 @@ class ThinDbObjectImpl extends DbObjectImpl {
       case types.DB_TYPE_NCHAR:
         return buf.readStr(constants.TNS_CS_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:
@@ -374,7 +387,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);
         }

lib/thin/protocol/buffer.js

@@ -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;
   }
 

lib/thin/protocol/messages/withData.js

@@ -173,7 +173,7 @@ class MessageWithData extends Message {
     let oid;
     let numBytes = buf.readUB4();               // OID
     if (numBytes > 0) {
-      oid = buf.readBytesWithLength();
+      oid = Buffer.from(buf.readBytesWithLength());
     }
     buf.skipUB2();                              // version
     buf.skipUB2();                              // character set id
@@ -378,7 +378,7 @@ class MessageWithData extends Message {
       const useLocalTime = (oraTypeNum === constants.TNS_DATA_TYPE_DATE ||
         oraTypeNum === constants.TNS_DATA_TYPE_TIMESTAMP);
       colValue = buf.readOracleDate(useLocalTime);
-    }  else if (oraTypeNum === constants.TNS_DATA_TYPE_ROWID) {
+    } else if (oraTypeNum === constants.TNS_DATA_TYPE_ROWID) {
       if (!this.inFetch) {
         colValue = buf.readStr(constants.TNS_CS_IMPLICIT);
       } else {
@@ -563,7 +563,7 @@ class MessageWithData extends Message {
 
     if (this.statement.isQuery) {
       this.inFetch = true;
-      if (this.statement.queryVars)  {
+      if (this.statement.queryVars) {
         this.outVariables = [];
         for (let i = 0; i < this.statement.queryVars.length; i++) {
           this.outVariables.push(this.statement.queryVars[i]);