oracledb 6.2.0 → 6.4.0

package/lib/thin/protocol/capabilities.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -89,7 +89,9 @@ class Capabilities {
     this.compileCaps[constants.TNS_CCAP_DBF_VERSION] =
       constants.TNS_CCAP_DBF_VERSION_MAX;
     this.compileCaps[constants.TNS_CCAP_LOB] =
-      constants.TNS_CCAP_LOB_UB8_SIZE | constants.TNS_CCAP_LOB_ENCS | constants.TNS_CCAP_LOB_PREFETCH;
+      constants.TNS_CCAP_LOB_UB8_SIZE | constants.TNS_CCAP_LOB_ENCS
+      | constants.TNS_CCAP_LOB_PREFETCH | constants.TNS_CCAP_LOB_TEMP_SIZE
+      | constants.TNS_CCAP_LOB_12C | constants.TNS_CCAP_LOB_PREFETCH_DATA;
     this.compileCaps[constants.TNS_CCAP_UB2_DTY] = 1;
     this.compileCaps[constants.TNS_CCAP_LOB2] =
       constants.TNS_CCAP_LOB2_QUASI | constants.TNS_CCAP_LOB2_2GB_PREFETCH;
@@ -102,6 +104,8 @@ class Capabilities {
       constants.TNS_CCAP_CLIENT_FN_MAX;
     this.compileCaps[constants.TNS_CCAP_TTC4] =
       constants.TNS_CCAP_INBAND_NOTIFICATION;
+    this.compileCaps[constants.TNS_CCAP_TTC5] =
+      constants.TNS_CCAP_VECTOR_SUPPORT;
   }
 
   initRuntimeCaps() {

package/lib/thin/protocol/constants.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -28,6 +28,7 @@
 
 const { Buffer } = require('buffer');
 const constants = require('../../constants.js');
+const dataHandlerConstants = require('../../impl/datahandlers/constants.js');
 
 module.exports = {
 
@@ -56,14 +57,14 @@ module.exports = {
 
   // authentication modes
   AUTH_MODE_DEFAULT: 0,
-  AUTH_MODE_PRELIM : 0x00000008,
-  AUTH_MODE_SYSASM : 0x00008000,
-  AUTH_MODE_SYSBKP : 0x00020000,
-  AUTH_MODE_SYSDBA : 0x00000002,
-  AUTH_MODE_SYSDGD : 0x00040000,
-  AUTH_MODE_SYSKMT : 0x00080000,
-  AUTH_MODE_SYSOPER:  0x00000004,
-  AUTH_MODE_SYSRAC : 0x00100000,
+  AUTH_MODE_PRELIM: 0x00000008,
+  AUTH_MODE_SYSASM: 0x00008000,
+  AUTH_MODE_SYSBKP: 0x00020000,
+  AUTH_MODE_SYSDBA: 0x00000002,
+  AUTH_MODE_SYSDGD: 0x00040000,
+  AUTH_MODE_SYSKMT: 0x00080000,
+  AUTH_MODE_SYSOPER: 0x00000004,
+  AUTH_MODE_SYSRAC: 0x00100000,
 
   // TTC authentication modes
   TNS_AUTH_MODE_LOGON: 0x00000001,
@@ -120,7 +121,7 @@ module.exports = {
   TNS_DATA_TYPE_AUA: 36 + 256,
   TNS_DATA_TYPE_RXH7: 37 + 256,
   TNS_DATA_TYPE_NA6: 38 + 256,
-  TNS_DATA_TYPE_OAC: 39,
+  TNS_DATA_TYPE_OAC9: 39,
   TNS_DATA_TYPE_AMS: 40,
   TNS_DATA_TYPE_BRN: 41,
   TNS_DATA_TYPE_BRP: 42 + 256,
@@ -194,10 +195,11 @@ module.exports = {
   TNS_DATA_TYPE_RSET: 116,
   TNS_DATA_TYPE_CWD: 117,
   TNS_DATA_TYPE_JSON: 119,
-  TNS_DATA_TYPE_NEW_OAC: 120,
+  TNS_DATA_TYPE_OAC122: 120,
   TNS_DATA_TYPE_UD12: 124 + 256,
   TNS_DATA_TYPE_AL8: 125 + 256,
   TNS_DATA_TYPE_LFOP: 126 + 256,
+  TNS_DATA_TYPE_VECTOR: 127,
   TNS_DATA_TYPE_FCRT: 127 + 256,
   TNS_DATA_TYPE_DNY: 128 + 256,
   TNS_DATA_TYPE_OPR: 129 + 256,
@@ -381,7 +383,7 @@ module.exports = {
   TNS_DATA_TYPE_XSNSOP2: 604,
   TNS_DATA_TYPE_XSNS2: 605,
   TNS_DATA_TYPE_IMPLRES: 611,
-  TNS_DATA_TYPE_OER: 612,
+  TNS_DATA_TYPE_OER19: 612,
   TNS_DATA_TYPE_UB1ARRAY: 613,
   TNS_DATA_TYPE_SESSSTATE: 614,
   TNS_DATA_TYPE_AC_REPLAY: 615,
@@ -400,8 +402,11 @@ module.exports = {
   TNS_DATA_TYPE_CHUNKINFO: 636,
   TNS_DATA_TYPE_SCN: 637,
   TNS_DATA_TYPE_SCN8: 638,
-  TNS_DATA_TYPE_UDS: 639,
+  TNS_DATA_TYPE_UD21: 639,
   TNS_DATA_TYPE_TNP: 640,
+  TNS_DATA_TYPE_OAC: 646,
+  TNS_DATA_TYPE_OER: 652,
+  TNS_DATA_TYPE_UDS: 663,
 
   // data type representations
   TNS_TYPE_REP_NATIVE: 0,
@@ -510,42 +515,6 @@ module.exports = {
 
   // base JSON constants
   TNS_JSON_MAX_LENGTH: 32 * 1024 * 1024,
-  TNS_JSON_MAGIC_BYTE_1: 0xff,
-  TNS_JSON_MAGIC_BYTE_2: 0x4a,       // 'J'
-  TNS_JSON_MAGIC_BYTE_3: 0x5a,       // 'Z'
-  TNS_JSON_VERSION: 1,
-  TNS_JSON_FLAG_HASH_ID_UINT8: 0x0100,
-  TNS_JSON_FLAG_HASH_ID_UINT16: 0x0200,
-  TNS_JSON_FLAG_NUM_FNAMES_UINT16: 0x0400,
-  TNS_JSON_FLAG_FNAMES_SEG_UINT32: 0x0800,
-  TNS_JSON_FLAG_TINY_NODES_STAT: 0x2000,
-  TNS_JSON_FLAG_TREE_SEG_UINT32: 0x1000,
-  TNS_JSON_FLAG_REL_OFFSET_MODE: 0x01,
-  TNS_JSON_FLAG_INLINE_LEAF: 0x02,
-  TNS_JSON_FLAG_LEN_IN_PCODE: 0x04,
-  TNS_JSON_FLAG_NUM_FNAMES_UINT32: 0x08,
-  TNS_JSON_FLAG_IS_SCALAR: 0x10,
-
-  // JSON data types
-  TNS_JSON_TYPE_NULL: 0x30,
-  TNS_JSON_TYPE_TRUE: 0x31,
-  TNS_JSON_TYPE_FALSE: 0x32,
-  TNS_JSON_TYPE_STRING_LENGTH_UINT8: 0x33,
-  TNS_JSON_TYPE_NUMBER_LENGTH_UINT8: 0x34,
-  TNS_JSON_TYPE_BINARY_DOUBLE: 0x36,
-  TNS_JSON_TYPE_STRING_LENGTH_UINT16: 0x37,
-  TNS_JSON_TYPE_STRING_LENGTH_UINT32: 0x38,
-  TNS_JSON_TYPE_TIMESTAMP: 0x39,
-  TNS_JSON_TYPE_BINARY_LENGTH_UINT16: 0x3a,
-  TNS_JSON_TYPE_BINARY_LENGTH_UINT32: 0x3b,
-  TNS_JSON_TYPE_DATE: 0x3c,
-  TNS_JSON_TYPE_INTERVAL_YM: 0x3d,
-  TNS_JSON_TYPE_INTERVAL_DS: 0x3e,
-  TNS_JSON_TYPE_TIMESTAMP_TZ: 0x7c,
-  TNS_JSON_TYPE_TIMESTAMP7: 0x7d,
-  TNS_JSON_TYPE_BINARY_FLOAT: 0x7f,
-  TNS_JSON_TYPE_OBJECT: 0x84,
-  TNS_JSON_TYPE_ARRAY: 0xc0,
 
   // end-to-end metrics
   TNS_END_TO_END_ACTION: 0x0010,
@@ -605,7 +574,8 @@ module.exports = {
   TNS_CCAP_TTC3: 37,
   TNS_CCAP_TTC4: 40,
   TNS_CCAP_LOB2: 42,
-  TNS_CCAP_MAX: 45,
+  TNS_CCAP_TTC5: 44,
+  TNS_CCAP_MAX: 51,
 
   // compile time capability values
   TNS_CCAP_SQL_VERSION_MAX: 6,
@@ -622,7 +592,13 @@ module.exports = {
   TNS_CCAP_FIELD_VERSION_21_1: 16,
   TNS_CCAP_FIELD_VERSION_23_1: 17,
   TNS_CCAP_FIELD_VERSION_23_1_EXT_1: 18,
-  TNS_CCAP_FIELD_VERSION_MAX: 18,
+  TNS_CCAP_FIELD_VERSION_23_1_EXT_2: 19,
+  TNS_CCAP_FIELD_VERSION_23_1_EXT_3: 20,
+  TNS_CCAP_FIELD_VERSION_23_1_EXT_4: 21,
+  TNS_CCAP_FIELD_VERSION_23_1_EXT_5: 22,
+  TNS_CCAP_FIELD_VERSION_23_1_EXT_6: 23,
+  TNS_CCAP_FIELD_VERSION_23_4: 24,
+  TNS_CCAP_FIELD_VERSION_MAX: 24,
   TNS_CCAP_O5LOGON: 8,
   TNS_CCAP_O5LOGON_NP: 2,
   TNS_CCAP_O7LOGON: 32,
@@ -642,13 +618,17 @@ module.exports = {
   TNS_CCAP_KEEP_OUT_ORDER: 0x80,
   TNS_CCAP_LOB_UB8_SIZE: 0x01,
   TNS_CCAP_LOB_ENCS: 0x02,
+  TNS_CCAP_LOB_PREFETCH_DATA: 0x04,
+  TNS_CCAP_LOB_TEMP_SIZE: 0x08,
   TNS_CCAP_LOB_PREFETCH: 0x40,
+  TNS_CCAP_LOB_12C: 0x80,
   TNS_CCAP_DRCP: 0x10,
   TNS_CCAP_ZLNP: 0x04,
   TNS_CCAP_INBAND_NOTIFICATION: 0x04,
   TNS_CCAP_CLIENT_FN_MAX: 12,
   TNS_CCAP_LOB2_QUASI: 0x01,
   TNS_CCAP_LOB2_2GB_PREFETCH: 0x04,
+  TNS_CCAP_VECTOR_SUPPORT: 0x08,
 
   // runtime capability indices
   TNS_RCAP_COMPAT: 0,
@@ -667,27 +647,22 @@ module.exports = {
   /** MultiRound SHA-512. */
   TNS_VERIFIER_TYPE_12C: 0x4815,
 
+  // UDS flags
+  TNS_UDS_FLAGS_IS_JSON: 0x00000100,
+  TNS_UDS_FLAGS_IS_OSON: 0x00000800,
+
   // other constants
-  TNS_MAX_SHORT_LENGTH: 252,
   TNS_ESCAPE_CHAR: 253,
-  TNS_LONG_LENGTH_INDICATOR: 254,
-  TNS_NULL_LENGTH_INDICATOR: 255,
+  TNS_LONG_LENGTH_INDICATOR: dataHandlerConstants.TNS_LONG_LENGTH_INDICATOR,
+  TNS_NULL_LENGTH_INDICATOR: dataHandlerConstants.TNS_NULL_LENGTH_INDICATOR,
   TNS_MAX_ROWID_LENGTH: 18,
-  TNS_DURATION_MID: 0x80000000,
-  TNS_DURATION_OFFSET: 60,
   TNS_DURATION_SESSION: 10,
   TNS_MAX_LONG_LENGTH: 0x7fffffff,
   TNS_SDU: 8192,
   TNS_TDU: 65535,
   TNS_TXN_IN_PROGRESS: 0x00000002,
   TNS_MAX_CONNECT_DATA: 230,
-  TNS_CHUNK_SIZE: 32767,
   TNS_MAX_UROWID_LENGTH: 3950,
-  TNS_HAS_REGION_ID: 0x80,
-
-  // timezone offsets
-  TZ_HOUR_OFFSET: 20,
-  TZ_MINUTE_OFFSET: 60,
 
   // drcp release mode
   DRCP_DEAUTHENTICATE: 0x00000002,
@@ -728,6 +703,10 @@ module.exports = {
   TNS_OBJ_TDS_TYPE_BLOB: 30,
   TNS_OBJ_TDS_TYPE_TIMESTAMP_LTZ: 33,
   TNS_OBJ_TDS_TYPE_BINARY_FLOAT: 37,
+  TNS_OBJ_TDS_TYPE_START_EMBED_ADT: 39,
+  TNS_OBJ_TDS_TYPE_END_EMBED_ADT: 40,
+  TNS_OBJ_TDS_TYPE_SUBTYPE_MARKER: 43,
+  TNS_OBJ_TDS_TYPE_EMBED_ADT_INFO: 44,
   TNS_OBJ_TDS_TYPE_BINARY_DOUBLE: 45,
 
   // xml type constants
@@ -743,13 +722,19 @@ module.exports = {
   TNS_ERR_NO_DATA_FOUND: 1403,
   TNS_ERR_SESSION_SHUTDOWN: 12572,
 
+  // warnings
+  TNS_WARN_COMPILATION_CREATE: 0x20,
+
+  // vector constants
+  TNS_VECTOR_MAX_LENGTH: 1048576,
+  VECTOR_FORMAT_FLEX: 0,
+  VECTOR_META_FLAG_FLEXIBLE_DIM: 1,
+
   // other constants
   PACKET_HEADER_SIZE: 8,
   NUMBER_AS_TEXT_CHARS: 172,
-  NUMBER_MAX_DIGITS: 40,
-  BUFFER_CHUNK_SIZE: 65536,
   CHUNKED_BYTES_CHUNK_SIZE: 65536,
 
-  TNS_BASE64_ALPHABET_ARRAY:  Buffer.from('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'),
+  TNS_BASE64_ALPHABET_ARRAY: Buffer.from('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'),
   TNS_EXTENT_OID: Buffer.from('00000000000000000000000000010001', 'hex')
 };

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

@@ -98,8 +98,7 @@ class AuthMessage extends Message {
       this.functionCode = constants.TNS_FUNC_AUTH_PHASE_TWO;
     this.privateKey = config.privateKey;
     if (this.privateKey) {
-      this.privateKey = '-----BEGIN PRIVATE KEY-----\n' + this.privateKey;
-      this.privateKey = this.privateKey + '\n' + '-----END PRIVATE KEY-----';
+      this.privateKey = util.normalizePrivateKey(this.privateKey);
     }
     this.serviceName = this.conn.serviceName;
     this.remoteAddress = this.conn.remoteAddress;
@@ -321,9 +320,14 @@ class AuthMessage extends Message {
       let portReleaseNum;
       let portUpdateNum;
 
+      this.conn.dbDomain = this.sessionData['AUTH_SC_DB_DOMAIN'];
+      this.conn.dbName = this.sessionData['AUTH_SC_DBUNIQUE_NAME'];
+      this.conn.maxOpenCursors = Number(this.sessionData['AUTH_MAX_OPEN_CURSORS'] || 0);
+      this.conn.serviceName = this.sessionData['AUTH_SC_SERVICE_NAME'];
       this.conn.instanceName = this.sessionData['AUTH_INSTANCENAME'];
       const fullVersionNum = Number(this.sessionData['AUTH_VERSION_NO']);
       const versionNum = (fullVersionNum >> 24) & 0xFF;
+      this.conn.warning = this.warning;
       if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_18_1_EXT_1) {
         releaseNum = (fullVersionNum >> 16) & 0xFF;
         updateNum = (fullVersionNum >> 12) & 0x0F;

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -44,9 +44,9 @@ class Message {
     this.flushOutBinds = false;
     this.endToEndSeqNum = 0;
     this.errorOccurred = false;
-    this.isWarning = false;
     this.flushOutBinds = false;
     this.processedError = false;
+    this.warning = undefined;
   }
 
   preProcess() { }
@@ -69,13 +69,16 @@ class Message {
     buf.skipUB2();                              // array elem error
     buf.skipUB2();                              // array elem error
     this.errorInfo.cursorId = buf.readUB2();    // cursor id
-    this.errorInfo.pos = buf.readUB2();         // error position
-    buf.skipUB1();                              // sql type
+    const errorPos = buf.readSB2();             // error position
+    buf.skipUB1();                              // sql type (19c and earlier)
     buf.skipUB1();                              // fatal ?
-    buf.skipUB2();                              // flags
-    buf.skipUB2();                              // user cursor options
+    buf.skipUB1();                              // flags
+    buf.skipUB1();                              // user cursor options
     buf.skipUB1();                              // UPI parameter
-    buf.skipUB1();                              // warning flag
+    const warnFlag = buf.readUInt8();           // warning flag
+    if (warnFlag & constants.TNS_WARN_COMPILATION_CREATE) {
+      this.warning = errors.getErr(errors.WRN_COMPILATION_CREATE);
+    }
     this.errorInfo.rowID = buf.readRowID();     // rowid
     buf.skipUB4();                              // OS error
     buf.skipUB1();                              // statement error
@@ -87,11 +90,11 @@ class Message {
       buf.skipBytesChunked();
     }
     // batch error codes
-    let numEntries = buf.readUB2();             // batch error codes array
-    if (numEntries > 0) {
+    const numErrors = buf.readUB2();             // batch error codes array
+    if (numErrors > 0) {
       this.errorInfo.batchErrors = [];
       const firstByte = buf.readUInt8();
-      for (let i = 0; i < numEntries; i++) {
+      for (let i = 0; i < numErrors; i++) {
         if (firstByte === constants.TNS_LONG_LENGTH_INDICATOR) {
           buf.skipUB4();                        // chunk length ignored
         }
@@ -104,14 +107,21 @@ class Message {
     }
 
     // batch error offset
-    numEntries = buf.readUB2();                 // batch error row offset array
-    if (numEntries > 0) {
+    const numOffsets = buf.readUB4();           // batch error row offset array
+    if (numOffsets > 0) {
+      if (numOffsets > 65535) {
+        errors.throwErr(errors.ERR_TOO_MANY_BATCH_ERRORS);
+      }
       const firstByte = buf.readUInt8();
-      for (let i = 0; i < numEntries; i++) {
+      let offset;
+      for (let i = 0; i < numOffsets; i++) {
         if (firstByte === constants.TNS_LONG_LENGTH_INDICATOR) {
           buf.skipUB4();                        // chunk length ignored
         }
-        this.errorInfo.batchErrors[i].offset = buf.readUB4();
+        offset = buf.readUB4();
+        if (i < numErrors) {
+          this.errorInfo.batchErrors[i].offset = offset;
+        }
       }
       if (firstByte === constants.TNS_LONG_LENGTH_INDICATOR) {
         buf.skipBytes(1);                       // ignore end marker
@@ -119,10 +129,10 @@ class Message {
     }
 
     // batch error messages
-    numEntries = buf.readUB2();                 // batch error messages array
-    if (numEntries > 0) {
+    const errMsgArr = buf.readUB2();                 // batch error messages array
+    if (errMsgArr > 0) {
       buf.skipBytes(1);                         // ignore packed size
-      for (let i = 0; i < numEntries; i++) {
+      for (let i = 0; i < errMsgArr; i++) {
         buf.skipUB2();                          // skip chunk length
 
         this.errorInfo.batchErrors[i].message = buf.readStr(constants.CSFRM_IMPLICIT);
@@ -132,28 +142,40 @@ class Message {
 
     this.errorInfo.num = buf.readUB4();         // error number (extended)
     this.errorInfo.rowCount = buf.readUB8();    // row number (extended)
+
+    // fields added in Oracle Database 20c
+    if (buf.caps.ttcFieldVersion >= constants.TNS_CCAP_FIELD_VERSION_20_1) {
+      buf.skipUB4();                           // sql type
+      buf.skipUB4();                           // server checksum
+    }
+
+    // error message
     if (this.errorInfo.num !== 0) {
       this.errorOccurred = true;
+      if (errorPos >= 0) {
+        this.errorInfo.pos = errorPos;
+      }
       this.errorInfo.message = buf.readStr(constants.CSFRM_IMPLICIT);
       /*
        * Remove ending newline from ORA error message
        */
-      this.errorInfo.message = this.errorInfo.message.replace(/\n+$/, "");
+      this.errorInfo.message = this.errorInfo.message.trim();
     }
-    this.errorInfo.isWarning = false;
     this.processedError = true;
   }
 
   processReturnParameter() { }
 
   processWarningInfo(buf) {
-    this.errorInfo.num = buf.readUB2();         // error number
-    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);
+    const errNum = buf.readUB2();              // warning number
+    const numBytes = buf.readUB2();            // length of warning message
+    buf.skipUB2();                             // flags
+    if (errNum != 0 && numBytes > 0) {
+      // get message string and remove the ending newline.
+      const message = buf.readStr(constants.CSFRM_IMPLICIT).trim();
+      this.warning = new Error(message);
+      this.warning.errorNum = errNum;
     }
-    this.errorInfo.isWarning = true;
   }
 
   hasMoreData(buf) {
@@ -260,7 +282,7 @@ class Message {
       const flags = buf.readUB4();              // session flags
       if (flags & constants.TNS_SESSGET_SESSION_CHANGED) {
         if (this.connection._drcpEstablishSession) {
-          this.connection.resetStatementCache();
+          this.connection.statementCache.clearOpenCursors();
         }
       }
       this.connection._drcpEstablishSession = false;
@@ -275,7 +297,7 @@ class Message {
     if (this.connection._currentSchemaModified) {
       this._writeCurrentSchemaPiggyback(buf);
     }
-    if (this.connection._cursorsToClose.size > 0 && !this.connection._drcpEstablishSession) {
+    if (this.connection.statementCache._cursorsToClose.size > 0 && !this.connection._drcpEstablishSession) {
       this.writeCloseCursorsPiggyBack(buf);
     }
     if (
@@ -304,11 +326,7 @@ class Message {
   writeCloseCursorsPiggyBack(buf) {
     this.writePiggybackHeader(buf, constants.TNS_FUNC_CLOSE_CURSORS);
     buf.writeUInt8(1);
-    buf.writeUB4(this.connection._cursorsToClose.size);
-    for (const cursorNum of this.connection._cursorsToClose.keys()) {
-      buf.writeUB4(cursorNum);
-    }
-    this.connection._cursorsToClose.clear();
+    this.connection.statementCache.writeCursorsToClose(buf);
   }
 
   writeCloseTempLobsPiggyback(buf) {

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -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,12 @@ 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],
+  [constants.TNS_DATA_TYPE_VECTOR, constants.TNS_DATA_TYPE_VECTOR, 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;
     }
   }