oracledb 6.2.0 → 6.4.0

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -30,7 +30,7 @@ const { Buffer } = require('buffer');
 const utils = require("../utils");
 const constants = require("../constants.js");
 const Message = require("./base.js");
-const ThinDbObjectImpl = require("../../dbObject.js");
+const { ThinDbObjectImpl, readXML } = require("../../dbObject.js");
 const ThinLobImpl = require("../../lob.js");
 const errors = require('../../../errors');
 const types = require('../../../types.js');
@@ -117,7 +117,7 @@ class MessageWithData extends Message {
       this.errorOccurred = false;
       this.statement.moreRowsToFetch = false;
     } else if (this.errorInfo.num !== 0 && this.errorInfo.cursorId !== 0) {
-      this.connection.statementCache.delete(this.statement.sql);
+      this.connection.statementCache._cachedStatements.delete(this.statement.sql);
       this.statement.returnToCache = false;
     }
     if (this.errorInfo.batchErrors) {
@@ -148,15 +148,16 @@ class MessageWithData extends Message {
       buf.skipUB1();
     }
     resultSet.metadata = [];
+    const metadata = [];
+    const queryVars = [];
     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);
+      queryVars.push(variable);
+      metadata.push(variable.fetchInfo);
     }
-
     let numBytes = buf.readUB4();
     if (numBytes > 0) {
       buf.skipBytesChunked();                   // current date
@@ -170,6 +171,13 @@ class MessageWithData extends Message {
       buf.skipBytesChunked();
     }
 
+    /*
+     * The message state(resultSet) and statement state(queryVars) is modified
+     * at end of the DescribeInfo function so that an OutOfPacketsError
+     * won't cause partial information state to be stored.
+     */
+    resultSet.metadata = metadata;
+    statement.queryVars = queryVars;
     this.resultSetsToSetup.push(resultSet);
   }
 
@@ -177,19 +185,10 @@ class MessageWithData extends Message {
     const dataType = buf.readUInt8();
     buf.skipUB1(); // flags
     const precision = buf.readInt8();
-    let scale;
-    if (dataType === constants.TNS_DATA_TYPE_NUMBER ||
-        dataType === constants.TNS_DATA_TYPE_INTERVAL_DS ||
-        dataType === constants.TNS_DATA_TYPE_TIMESTAMP ||
-        dataType === constants.TNS_DATA_TYPE_TIMESTAMP_LTZ ||
-        dataType === constants.TNS_DATA_TYPE_TIMESTAMP_TZ) {
-      scale = buf.readSB2();
-    } else {
-      scale = buf.readInt8();
-    }
+    const scale = buf.readInt8();
     const maxSize = buf.readUB4();
     buf.skipUB4();                              // max number of array elements
-    buf.skipUB4();                              // cont flags
+    buf.skipUB8();                              // cont flags
     let oid;
     let numBytes = buf.readUB4();               // OID
     if (numBytes > 0) {
@@ -223,7 +222,7 @@ class MessageWithData extends Message {
       typeName = buf.readStr(constants.CSFRM_IMPLICIT);
     }
     buf.skipUB2();                              // column position
-    buf.skipUB4();                              // uds flag
+    const udsFlags = buf.readUB4();             // uds flag
 
     // build metadata
     const fetchInfo = {
@@ -231,6 +230,53 @@ class MessageWithData extends Message {
       dbType: types.getTypeByOraTypeNum(dataType, csfrm),
       nullable: nullable
     };
+    fetchInfo.isJson = Boolean(udsFlags & constants.TNS_UDS_FLAGS_IS_JSON);
+    fetchInfo.isOson = Boolean(udsFlags & constants.TNS_UDS_FLAGS_IS_OSON);
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_23_1) {
+      numBytes = buf.readUB4();
+      if (numBytes > 0) {
+        fetchInfo.domainSchema = buf.readStr(constants.CSFRM_IMPLICIT);
+      }
+      numBytes = buf.readUB4();
+      if (numBytes > 0) {
+        fetchInfo.domainName = buf.readStr(constants.CSFRM_IMPLICIT);
+      }
+    }
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_23_1_EXT_3) {
+      if (buf.readUB4() > 0) {
+        fetchInfo.annotations = {};
+        buf.skipUB1();
+        const numAnnotations = buf.readUB4();
+        buf.skipUB1();
+        let key, value;
+        for (let i = 0; i < numAnnotations; i++) {
+          buf.skipUB4();
+          value = "";
+          key = buf.readStr(constants.CSFRM_IMPLICIT);
+          numBytes = buf.readUB4();
+          if (numBytes > 0) {
+            value = buf.readStr(constants.CSFRM_IMPLICIT);
+          }
+          fetchInfo.annotations[key] = value;
+          buf.skipUB4();                        // flags
+        }
+        buf.skipUB4();                          // flags
+      }
+    }
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_23_4) {
+      const dimensions = buf.readUB4();
+      const vectorFormat = buf.readUInt8();
+      const vectorFlags = buf.readUInt8();
+      if (fetchInfo.dbType === types.DB_TYPE_VECTOR) {
+        if (!(vectorFlags & constants.VECTOR_META_FLAG_FLEXIBLE_DIM)) {
+          fetchInfo.vectorDimensions = dimensions;
+        }
+        if (vectorFormat !== constants.VECTOR_FORMAT_FLEX) {
+          fetchInfo.vectorFormat = vectorFormat;
+        }
+      }
+    }
+
     switch (fetchInfo.dbType) {
       case types.DB_TYPE_VARCHAR:
       case types.DB_TYPE_NVARCHAR:
@@ -253,6 +299,9 @@ class MessageWithData extends Message {
         if (fetchInfo.dbTypeClass.partial) {
           this.connection._partialDbObjectTypes.push(fetchInfo.dbTypeClass);
         }
+        if (fetchInfo.dbTypeClass.isXmlType) {
+          fetchInfo.dbType = types.DB_TYPE_XMLTYPE;
+        }
         break;
       default:
         break;
@@ -454,14 +503,21 @@ class MessageWithData extends Message {
       }
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_JSON) {
       colValue = buf.readOson();
+    } else if (oraTypeNum === constants.TNS_DATA_TYPE_VECTOR) {
+      colValue = buf.readVector();
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_INT_NAMED) {
       const obj = buf.readDbObject();
       if (obj.packedData) {
         const objType = (variable.fetchInfo) ? variable.fetchInfo.dbTypeClass :
           variable.typeClass;
-        colValue = new ThinDbObjectImpl(objType, obj.packedData);
-        colValue.toid = obj.toid;
-        colValue.oid = obj.oid;
+
+        if (variable.type === types.DB_TYPE_XMLTYPE) {
+          colValue = readXML(this.connection, obj.packedData);
+        } else {
+          colValue = new ThinDbObjectImpl(objType, obj.packedData);
+          colValue.toid = obj.toid;
+          colValue.oid = obj.oid;
+        }
       }
     } else {
       errors.throwErr(errors.ERR_UNSUPPORTED_DATA_TYPE, dbType.num,
@@ -472,7 +528,10 @@ class MessageWithData extends Message {
       const actualNumBytes = buf.readSB4();
       if (actualNumBytes < 0 && oraTypeNum === constants.TNS_DATA_TYPE_BOOLEAN) {
         colValue = null;
-      } else if (actualNumBytes !== 0 && colValue !== null) {
+
+      // For objects, maxsize validation is skipped
+      } else if (actualNumBytes !== 0 && colValue !== null &&
+        oraTypeNum !== constants.TNS_DATA_TYPE_INT_NAMED) {
         this.saveDeferredErr(errors.ERR_INSUFFICIENT_BUFFER_FOR_BINDS);
       }
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_LONG || oraTypeNum === constants.TNS_DATA_TYPE_LONG_RAW || variable.maxSize > buf.caps.maxStringSize) {
@@ -554,7 +613,8 @@ class MessageWithData extends Message {
         if (variable.type === types.DB_TYPE_CLOB ||
             variable.type === types.DB_TYPE_NCLOB ||
             variable.type === types.DB_TYPE_BLOB ||
-            variable.type === types.DB_TYPE_JSON) {
+            variable.type === types.DB_TYPE_JSON ||
+            variable.type === types.DB_TYPE_VECTOR) {
           if (variable.type !== variable.fetchInfo.fetchType) {
             variable.type = variable.fetchInfo.fetchType;
             variable.maxSize = constants.TNS_MAX_LONG_LENGTH;
@@ -639,6 +699,9 @@ class MessageWithData extends Message {
       } else if (variable.type === types.DB_TYPE_JSON) {
         contFlag = constants.TNS_LOB_PREFETCH_FLAG;
         maxSize = lobPrefetchLength = constants.TNS_JSON_MAX_LENGTH;
+      } else if (variable.type === types.DB_TYPE_VECTOR) {
+        contFlag = constants.TNS_LOB_PREFETCH_FLAG;
+        maxSize = lobPrefetchLength = constants.TNS_VECTOR_MAX_LENGTH;
       }
       buf.writeUInt8(oraTypeNum);
       buf.writeUInt8(flag);
@@ -694,7 +757,7 @@ class MessageWithData extends Message {
           this.writeBindParamsColumn(buf, variable, variable.values[i]);
         }
       } else {
-        if (variable.maxSize > buf.caps.maxStringSize) {
+        if ((!this.statement.isPlSql) && variable.maxSize > buf.caps.maxStringSize) {
           foundLong = true;
         } else {
           this.writeBindParamsColumn(buf, variable,
@@ -759,8 +822,10 @@ class MessageWithData extends Message {
     ) {
       buf.writeOracleDate(value, variable.type);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_BINARY_DOUBLE) {
+      buf.writeUInt8(8);
       buf.writeBinaryDouble(value);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_BINARY_FLOAT) {
+      buf.writeUInt8(4);
       buf.writeBinaryFloat(value);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_CURSOR) {
       let cursor = value;
@@ -788,6 +853,8 @@ class MessageWithData extends Message {
       buf.writeBytesWithLength(Buffer.from(value));
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_JSON) {
       buf.writeOson(value);
+    } else if (oraTypeNum === constants.TNS_DATA_TYPE_VECTOR) {
+      buf.writeVector(value);
     } else if (oraTypeNum === constants.TNS_DATA_TYPE_INT_NAMED) {
       buf.writeDbObject(value);
     } else {

package/lib/thin/protocol/packet.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -26,11 +26,12 @@
 
 'use strict';
 
-const { BaseBuffer } = require('./buffer.js');
+const { BaseBuffer } = require('../../impl/datahandlers/buffer.js');
 const { Buffer } = require('buffer');
-const constants = require("./constants.js");
-const oson = require('./oson.js');
+const constants = require('./constants.js');
+const oson = require('../../impl/datahandlers/oson.js');
 const utils = require('./utils.js');
+const vector = require('../../impl/datahandlers/vector.js');
 const errors = require("../../errors.js");
 
 const TNS_BASE64_ALPHABET_ARRAY = Buffer.from("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 'utf8');
@@ -395,6 +396,22 @@ class ReadPacket extends BaseBuffer {
     return {rba, partitionID, blockNum, slotNum};
   }
 
+  /**
+   * Reads VECTOR data (QLocator followed by data) and decodes it into a
+   * JavaScript object.
+   */
+  readVector() {
+    const numBytes = this.readUB4();
+    if (numBytes === 0) {
+      return null;
+    }
+    this.skipUB8();                     // size (unused)
+    this.skipUB4();                     // chunk size (unused)
+    const decoder = new vector.VectorDecoder(this.readBytesWithLength());
+    this.skipBytesChunked();            // locator (unused)
+    return decoder.decode();
+  }
+
   skipBytesChunked() {
     const numBytes = this.readUInt8();
     if (numBytes === 0 || numBytes === constants.TNS_NULL_LENGTH_INDICATOR) {
@@ -479,6 +496,9 @@ class WritePacket extends BaseBuffer {
       buf = Buffer.from(buf);
       this.startPacket();
     }
+    if (!this.nsi.ntAdapter) {
+      errors.throwErr(errors.ERR_INVALID_CONNECTION);
+    }
     this.nsi.ntAdapter.send(buf);
   }
 
@@ -537,6 +557,40 @@ class WritePacket extends BaseBuffer {
     this.protocol.sequenceId = (this.protocol.sequenceId + 1) % 256;
   }
 
+  /**
+   * Encodes a JavaScript object into VECTOR data and then writes it (QLocator
+   * followed by data) to the buffer.
+   */
+  writeVector(value) {
+    const encoder = new vector.VectorEncoder();
+    const buf = encoder.encode(value);
+    this.writeQLocator(buf.length);
+    this.writeBytesWithLength(buf);
+  }
+
+  //---------------------------------------------------------------------------
+  // writeQLocator()
+  //
+  // Writes a QLocator. QLocators are always 40 bytes in length.
+  //---------------------------------------------------------------------------
+  writeQLocator(numBytes) {
+    this.writeUB4(40);                  // QLocator length
+    this.writeUInt8(40);                // repeated length
+    this.writeUInt16BE(38);             // internal length
+    this.writeUInt16BE(constants.TNS_LOB_QLOCATOR_VERSION);
+    this.writeUInt8(constants.TNS_LOB_LOC_FLAGS_VALUE_BASED |
+      constants.TNS_LOB_LOC_FLAGS_BLOB | constants.TNS_LOB_LOC_FLAGS_ABSTRACT);
+    this.writeUInt8(constants.TNS_LOB_LOC_FLAGS_INIT);
+    this.writeUInt16BE(0);              // additional flags
+    this.writeUInt16BE(1);              // byt1
+    this.writeUInt64BE(numBytes);
+    this.writeUInt16BE(0);              // unused
+    this.writeUInt16BE(0);              // csid
+    this.writeUInt16BE(0);              // unused
+    this.writeUInt64BE(0);              // unused
+    this.writeUInt64BE(0);              // unused
+  }
+
 }
 
 module.exports = {

package/lib/thin/protocol/utils.js

@@ -64,7 +64,7 @@ function setObfuscatedValue(value) {
     arr.push(buf[i] ^ bytes[i]);
   }
   bytes.fill(0);
-  return {obfuscatedValue : buf, value : arr};
+  return {obfuscatedValue: buf, value: arr};
 }
 
 // returns the Deobfuscated value, after removing the obfuscation

package/lib/thin/sqlnet/connStrategy.js

@@ -53,16 +53,20 @@ class ConnectDescription {
  */
 class ConnStrategy {
   constructor() {
-    this.nextOptToTry = 0;
-    this.reorderDescriptionList = 0;
+    this.reset();
     this.retryCount = 0;
-    this.lastRetryCounter = 0;
-    this.lastRetryConnectDescription = 0;
     this.currentDescription = null;
     this.descriptionList = new Array();
     this.sBuf = new Array();
   }
 
+  reset() {
+    this.nextOptToTry = 0;
+    this.lastRetryCounter = 0;
+    this.lastRetryConnectDescription = 0;
+    this.reorderDescriptionList = 0;
+  }
+
   hasMoreOptions() {
     let cOptsSize = 0;