oracledb 6.1.0 → 6.3.0

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

@@ -81,7 +81,7 @@ const dataTypes = [
   [constants.TNS_DATA_TYPE_LONG_RAW, constants.TNS_DATA_TYPE_LONG_RAW, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_UB2, constants.TNS_DATA_TYPE_UB2, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_UB4, constants.TNS_DATA_TYPE_UB4, constants.TNS_TYPE_REP_UNIVERSAL],
-  [constants.TNS_DATA_TYPE_SB1, constants.TNS_DATA_TYPE_SB1, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_SB1, constants.TNS_DATA_TYPE_SB1, constants.TNS_TYPE_REP_ORACLE],
   [constants.TNS_DATA_TYPE_SB2, constants.TNS_DATA_TYPE_SB2, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_SB4, constants.TNS_DATA_TYPE_SB4, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_SWORD, constants.TNS_DATA_TYPE_SWORD, constants.TNS_TYPE_REP_UNIVERSAL],
@@ -93,7 +93,7 @@ const dataTypes = [
   [constants.TNS_DATA_TYPE_AMS, constants.TNS_DATA_TYPE_AMS, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_BRN, constants.TNS_DATA_TYPE_BRN, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_CWD, constants.TNS_DATA_TYPE_CWD, constants.TNS_TYPE_REP_UNIVERSAL],
-  [constants.TNS_DATA_TYPE_NEW_OAC, constants.TNS_DATA_TYPE_NEW_OAC, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_OAC122, constants.TNS_DATA_TYPE_OAC122, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_OER8, constants.TNS_DATA_TYPE_OER8, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_FUN, constants.TNS_DATA_TYPE_FUN, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_AUA, constants.TNS_DATA_TYPE_AUA, constants.TNS_TYPE_REP_UNIVERSAL],
@@ -294,7 +294,7 @@ const dataTypes = [
   [constants.TNS_DATA_TYPE_PDN, constants.TNS_DATA_TYPE_NUMBER, constants.TNS_TYPE_REP_ORACLE],
   [constants.TNS_DATA_TYPE_VCS, constants.TNS_DATA_TYPE_VARCHAR, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_VBI, constants.TNS_DATA_TYPE_VARCHAR, constants.TNS_TYPE_REP_UNIVERSAL],
-  [constants.TNS_DATA_TYPE_OAC, constants.TNS_DATA_TYPE_NEW_OAC, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_OAC9, constants.TNS_DATA_TYPE_OAC9, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_UIN, constants.TNS_DATA_TYPE_NUMBER, constants.TNS_TYPE_REP_ORACLE],
   [constants.TNS_DATA_TYPE_SLS, constants.TNS_DATA_TYPE_NUMBER, constants.TNS_TYPE_REP_ORACLE],
   [constants.TNS_DATA_TYPE_LVC, constants.TNS_DATA_TYPE_VARCHAR, constants.TNS_TYPE_REP_UNIVERSAL],
@@ -360,7 +360,7 @@ const dataTypes = [
   [constants.TNS_DATA_TYPE_AC_REPLAY, constants.TNS_DATA_TYPE_AC_REPLAY, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_AC_CONT, constants.TNS_DATA_TYPE_AC_CONT, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_IMPLRES, constants.TNS_DATA_TYPE_IMPLRES, constants.TNS_TYPE_REP_UNIVERSAL],
-  [constants.TNS_DATA_TYPE_OER, constants.TNS_DATA_TYPE_OER, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_OER19, constants.TNS_DATA_TYPE_OER19, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_TXT, constants.TNS_DATA_TYPE_TXT, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_XSSESSNS, constants.TNS_DATA_TYPE_XSSESSNS, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_XSATTOP, constants.TNS_DATA_TYPE_XSATTOP, constants.TNS_TYPE_REP_UNIVERSAL],
@@ -388,8 +388,11 @@ const dataTypes = [
   [constants.TNS_DATA_TYPE_SCN, constants.TNS_DATA_TYPE_SCN, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_SCN8, constants.TNS_DATA_TYPE_SCN8, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_CHUNKINFO, constants.TNS_DATA_TYPE_CHUNKINFO, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_UD21, constants.TNS_DATA_TYPE_UD21, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_UDS, constants.TNS_DATA_TYPE_UDS, constants.TNS_TYPE_REP_UNIVERSAL],
-  [constants.TNS_DATA_TYPE_TNP, constants.TNS_DATA_TYPE_TNP, constants.TNS_TYPE_REP_UNIVERSAL]
+  [constants.TNS_DATA_TYPE_TNP, constants.TNS_DATA_TYPE_TNP, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_OER, constants.TNS_DATA_TYPE_OER, constants.TNS_TYPE_REP_UNIVERSAL],
+  [constants.TNS_DATA_TYPE_OAC, constants.TNS_DATA_TYPE_OAC, constants.TNS_TYPE_REP_UNIVERSAL]
 ];
 
 module.exports = DataTypeMessage;

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

@@ -169,7 +169,7 @@ class LobOpMessage extends Message {
   processReturnParameter(buf) {
     let lobArray;
     let locator;
-    let temp16;
+    let temp8;
     let numBytes;
     if (this.sourceLobImpl !== null) {
       numBytes = this.sourceLobImpl._locator.length;
@@ -184,15 +184,14 @@ class LobOpMessage extends Message {
       locator.copy(this.destLobImpl._locator);
     }
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
-      buf.skipUB2();
-    }
-    if (this.sendAmount) {
+      buf.skipUB2();        // skip character set
+      buf.skipBytes(3);     // skip trailing flags, amount
+    } else if (this.sendAmount) {
       this.amount = buf.readSB8();
     }
-    if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP
-      || this.operation === constants.TNS_LOB_OP_IS_OPEN) {
-      temp16 = buf.readUB2();
-      this.boolFlag = temp16 > 0;
+    if (this.operation === constants.TNS_LOB_OP_IS_OPEN) {
+      temp8 = buf.readUB1();
+      this.boolFlag = temp8 > 0;
     }
   }
 

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

@@ -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');
@@ -57,6 +57,7 @@ class MessageWithData extends Message {
     this.inFetch = false;
     this.parseOnly = false;
     this.resultSetsToSetup = [];
+    this.deferredErr = null;
   }
 
   /**
@@ -116,8 +117,8 @@ class MessageWithData extends Message {
       this.errorOccurred = false;
       this.statement.moreRowsToFetch = false;
     } else if (this.errorInfo.num !== 0 && this.errorInfo.cursorId !== 0) {
-      this.connection._addCursorToClose(this.statement.cursorId);
       this.connection.statementCache.delete(this.statement.sql);
+      this.statement.returnToCache = false;
     }
     if (this.errorInfo.batchErrors) {
       this.errorOccurred = false;
@@ -176,19 +177,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) {
@@ -222,7 +214,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 = {
@@ -230,6 +222,39 @@ class MessageWithData extends Message {
       dbType: types.getTypeByOraTypeNum(dataType, csfrm),
       nullable: nullable
     };
+    fetchInfo.isJson = Boolean(udsFlags & constants.TNS_UDS_FLAGS_IS_JSON);
+    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
+      }
+    }
+
     switch (fetchInfo.dbType) {
       case types.DB_TYPE_VARCHAR:
       case types.DB_TYPE_NVARCHAR:
@@ -252,6 +277,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;
@@ -458,9 +486,14 @@ class MessageWithData extends Message {
       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,
@@ -471,8 +504,11 @@ 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) {
-        errors.throwErr(errors.ERR_INSUFFICIENT_BUFFER_FOR_BINDS);
+
+      // 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) {
       buf.skipSB4();                            // null indicator
@@ -525,11 +561,15 @@ class MessageWithData extends Message {
   }
 
   async postProcess() {
+    if (this.deferredErr) {
+      throw this.deferredErr;
+    }
+
     if (this.outVariables) {
       for (const variable of this.outVariables) {
         if (variable.isArray) {
-          for (let pos = 0; pos < variable.numElementsInArray; pos++) {
-            if (variable.outConverter) {
+          if (variable.outConverter) {
+            for (let pos = 0; pos < variable.numElementsInArray; pos++) {
               variable.values[0][pos] = await variable.outConverter(variable.values[0][pos]);
             }
           }
@@ -689,7 +729,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,

package/lib/thin/protocol/oson.js

@@ -416,10 +416,11 @@ class OsonTreeSegment extends GrowableBuffer {
   //---------------------------------------------------------------------------
   _encodeArray(value, fnamesSeg) {
     this._encodeContainer(constants.TNS_JSON_TYPE_ARRAY, value.length);
-    let offsetsBufPos = 0;
-    const offsetsBuf = this.reserveBytes(value.length * 4);
+    const len = value.length * 4;
+    const pos = this.reserveBytes(len);
+    let offsetsBufPos = pos;
     for (const element of value) {
-      offsetsBuf.writeUInt32BE(this.pos, offsetsBufPos);
+      this.buf.writeUInt32BE(this.pos, offsetsBufPos);
       offsetsBufPos += 4;
       this.encodeNode(element, fnamesSeg);
     }
@@ -456,19 +457,21 @@ class OsonTreeSegment extends GrowableBuffer {
   _encodeObject(value, fnamesSeg) {
     const numChildren = value.values.length;
     this._encodeContainer(constants.TNS_JSON_TYPE_OBJECT, numChildren);
-    let fieldIdOffset = 0;
-    let valueOffset = numChildren * fnamesSeg.fieldIdSize;
-    const buf = this.reserveBytes(numChildren * (fnamesSeg.fieldIdSize + 4));
+    const len = numChildren * (fnamesSeg.fieldIdSize + 4);
+    const pos = this.reserveBytes(len);
+    let fieldIdOffset = pos;
+    let valueOffset = pos + (numChildren * fnamesSeg.fieldIdSize);
+
     for (let i = 0; i < value.fields.length; i++) {
       const fieldName = fnamesSeg.fieldNamesMap.get(value.fields[i]);
       if (fnamesSeg.fieldIdSize == 1) {
-        buf[fieldIdOffset] = fieldName.fieldId;
+        this.buf[fieldIdOffset] = fieldName.fieldId;
       } else if (fnamesSeg.fieldIdSize == 2) {
-        buf.writeUInt16BE(fieldName.fieldId, fieldIdOffset);
+        this.buf.writeUInt16BE(fieldName.fieldId, fieldIdOffset);
       } else {
-        buf.writeUInt32BE(fieldName.fieldId, fieldIdOffset);
+        this.buf.writeUInt32BE(fieldName.fieldId, fieldIdOffset);
       }
-      buf.writeUInt32BE(this.pos, valueOffset);
+      this.buf.writeUInt32BE(this.pos, valueOffset);
       fieldIdOffset += fnamesSeg.fieldIdSize;
       valueOffset += 4;
       this.encodeNode(value.values[i], fnamesSeg);

package/lib/thin/protocol/packet.js

@@ -35,7 +35,6 @@ const errors = require("../../errors.js");
 
 const TNS_BASE64_ALPHABET_ARRAY = Buffer.from("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 'utf8');
 
-
 /**
  * Class used for byte chunks used in the ChunkedBytesBuffer.
  */
@@ -52,7 +51,7 @@ class BytesChunk {
     if (remainder > 0) {
       this.allocLen += (constants.CHUNKED_BYTES_CHUNK_SIZE - remainder);
     }
-    this.buf = Buffer.alloc(this.allocLen);
+    this.buf = Buffer.allocUnsafe(this.allocLen);
     this.actualLen = 0;
   }
 
@@ -133,6 +132,7 @@ class ChunkedBytesBuffer {
  *
  * @class ReadPacket
  */
+
 class ReadPacket extends BaseBuffer {
 
   /**
@@ -140,8 +140,9 @@ class ReadPacket extends BaseBuffer {
    * @param {Object} adapter used for sending/receiving data
    * @param {Object} capabilities
    */
+
   constructor(nsi, caps) {
-    super(nsi.sAtts.sdu);
+    super();
     this.nsi = nsi;
     this.caps = caps;
     this.chunkedBytesBuf = new ChunkedBytesBuffer();
@@ -228,7 +229,7 @@ class ReadPacket extends BaseBuffer {
     if (inChunkedRead) {
       buf = this.chunkedBytesBuf.getBuf(numBytes);
     } else {
-      buf = Buffer.alloc(numBytes);
+      buf = Buffer.allocUnsafe(numBytes);
     }
 
     // copy the bytes to the buffer from the remainder of this packet
@@ -341,7 +342,7 @@ class ReadPacket extends BaseBuffer {
       outputLen += 3;
     }
 
-    const outputValue =  Buffer.alloc(outputLen);
+    const outputValue =  Buffer.allocUnsafe(outputLen);
     inputLen -= 1;
     outputValue[0] = 42;
     outputOffset += 1;

package/lib/thin/protocol/utils.js

@@ -43,7 +43,7 @@ function _convertBase64(result, value, size, offset) {
 function encodeRowID(rowID) {
   let offset = 0;
   if (rowID.rba !== 0 || rowID.partitionID !== 0 || rowID.blockNum !== 0 || rowID.slotNum != 0) {
-    const result = Buffer.alloc(constants.TNS_MAX_ROWID_LENGTH);
+    const result = Buffer.allocUnsafe(constants.TNS_MAX_ROWID_LENGTH);
     offset = _convertBase64(result, rowID.rba, 6, offset);
     offset = _convertBase64(result, rowID.partitionID, 3, offset);
     offset = _convertBase64(result, rowID.blockNum, 6, offset);
@@ -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;