oracledb 6.2.0 → 6.3.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');
@@ -177,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) {
@@ -223,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 = {
@@ -231,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:
@@ -253,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;
@@ -459,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,
@@ -472,7 +504,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) {
@@ -694,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/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;
 

package/lib/thin/sqlnet/constants.js

@@ -27,175 +27,175 @@
 
 module.exports =  {
   // TNS packet types
-  NSPTCN : 1,          // Connect
-  NSPTAC : 2,          // Accept
-  NSPTAK : 3,          // Acknowledge
-  NSPTRF : 4,          // Refuse
-  NSPTRD : 5,          // Redirect
-  NSPTDA : 6,          // Data
-  NSPTNL : 7,          // Null
-  NSPTAB : 9,          // Abort
-  NSPTRS : 11,         // Re-send
-  NSPTMK : 12,         // Marker
-  NSPTAT : 13,         // Attention
-  NSPTCNL : 14,        // Control information
-  NSPTDD  : 15,        // data descriptor
-  NSPTHI  : 19,        // Highest legal packet type
+  NSPTCN: 1,          // Connect
+  NSPTAC: 2,          // Accept
+  NSPTAK: 3,          // Acknowledge
+  NSPTRF: 4,          // Refuse
+  NSPTRD: 5,          // Redirect
+  NSPTDA: 6,          // Data
+  NSPTNL: 7,          // Null
+  NSPTAB: 9,          // Abort
+  NSPTRS: 11,         // Re-send
+  NSPTMK: 12,         // Marker
+  NSPTAT: 13,         // Attention
+  NSPTCNL: 14,        // Control information
+  NSPTDD: 15,         // data descriptor
+  NSPTHI: 19,         // Highest legal packet type
 
   // Packet Header
-  NSPHDLEN  : 0,       // Packet length
-  NSPHDPSM  : 2,       // Packet checksum(deprecated in version 3.15 with large sdu support)
-  NSPHDTYP  : 4,       // Packet type
-  NSPHDFLGS : 5,       // Packet flags
-  NSPHDHSM  : 6,       // Header checksum
-  NSPSIZHD  : 8,       // Packet header size
+  NSPHDLEN: 0,       // Packet length
+  NSPHDPSM: 2,       // Packet checksum(deprecated in version 3.15 with large sdu support)
+  NSPHDTYP: 4,       // Packet type
+  NSPHDFLGS: 5,      // Packet flags
+  NSPHDHSM: 6,       // Header checksum
+  NSPSIZHD: 8,       // Packet header size
 
   /* Packet flags for NSPHDFLGS */
-  NSPFSID  : 0x01,     // SID is given
-  NSPFRDS  : 0x02,     // ReDirect Separation of cnda vs cndo
-  NSPFRDR  : 0x04,     // ReDiRected client Connect (NSPTCN)
-  NSPFLSD  : 0x20,     // packet with large sdu field
-  NO_HEADER_FLAGS : 0,
-  NSPFSRN  : 0x08,
+  NSPFSID: 0x01,     // SID is given
+  NSPFRDS: 0x02,     // ReDirect Separation of cnda vs cndo
+  NSPFRDR: 0x04,     // ReDiRected client Connect (NSPTCN)
+  NSPFLSD: 0x20,     // packet with large sdu field
+  NO_HEADER_FLAGS: 0,
+  NSPFSRN: 0x08,
 
   // Connect Packet
-  NSPCNVSN   : 8,    // My version number
-  NSPCNLOV   : 10,   // Lowest version number I can be compatible with
-  NSPCNOPT   : 12,   // Global service options
-  NSPCNSDU   : 14,   // My SDU size
-  NSPCNTDU   : 16,   // Maximum TDU size
-  NSPCNNTC   : 18,   // NT characterstics
-  NSPCNTNA   : 20,   // Line turnaround value
-  NSPCNONE   : 22,   // The value '1' in my hardware byte order
-  NSPCNLEN   : 24,   // Length of connect data
-  NSPCNOFF   : 26,   // Offset to connect data
-  NSPCNMXC   : 28,   // Maximum connect data you can send me
-  NSPCNFL0   : 32,   // Connect flags
-  NSPCNFL1   : 33,
-  NSPCNTMO   : 50,   // local connection timeout val
-  NSPCNTCK   : 52,   // local tick size
-  NSPCNADL   : 54,
-  NSPCNAOF   : 56,   // offset to reconnect tns addr
-  NSPCNLSD   : 58,   // large sdu
-  NSPCNLTD   : 62,   // large tdu
-  NSPCNCFL   : 66,   // compression data
-  NSPCNCFL2  : 70,   // connect flag2
+  NSPCNVSN: 8,    // My version number
+  NSPCNLOV: 10,   // Lowest version number I can be compatible with
+  NSPCNOPT: 12,   // Global service options
+  NSPCNSDU: 14,   // My SDU size
+  NSPCNTDU: 16,   // Maximum TDU size
+  NSPCNNTC: 18,   // NT characterstics
+  NSPCNTNA: 20,   // Line turnaround value
+  NSPCNONE: 22,   // The value '1' in my hardware byte order
+  NSPCNLEN: 24,   // Length of connect data
+  NSPCNOFF: 26,   // Offset to connect data
+  NSPCNMXC: 28,   // Maximum connect data you can send me
+  NSPCNFL0: 32,   // Connect flags
+  NSPCNFL1: 33,
+  NSPCNTMO: 50,   // local connection timeout val
+  NSPCNTCK: 52,   // local tick size
+  NSPCNADL: 54,
+  NSPCNAOF: 56,   // offset to reconnect tns addr
+  NSPCNLSD: 58,   // large sdu
+  NSPCNLTD: 62,   // large tdu
+  NSPCNCFL: 66,   // compression data
+  NSPCNCFL2: 70,  // connect flag2
   //  NSPCNV310DAT : (NSPCNTMO + 8), start of connect data, V3.10   packet
   //  NSPCNV315DAT : (NSPCNCFL + 4),
-  NSPCNDAT : 74,      // Start connect data
-  NSPMXCDATA : 230,   // Maximum length of connect data
+  NSPCNDAT: 74,      // Start connect data
+  NSPMXCDATA: 230,   // Maximum length of connect data
   // Connect flags (Used mostly by NA)
-  NSINAWANTED               : 0x01, // Want to use NA
-  NSINAINTCHG               : 0x02, // Interchange involved
+  NSINAWANTED: 0x01, // Want to use NA
+  NSINAINTCHG: 0x02, // Interchange involved
   NSINADISABLEDFORCONNECTION: 0x04, // Disable NA
-  NSINANOSERVICES           : 0x08, // No NA services linked
-  NSINAREQUIRED             : 0x10, // NA is required
-  NSINAAUTHWANTED           : 0x20, // Authentication linked
-  NSISUPSECRENEG            : 0x80, // bkwrd comp: SUPport SECurity RE-NEG
+  NSINANOSERVICES: 0x08, // No NA services linked
+  NSINAREQUIRED: 0x10,   // NA is required
+  NSINAAUTHWANTED: 0x20, // Authentication linked
+  NSISUPSECRENEG: 0x80,  // bkwrd comp: SUPport SECurity RE-NEG
   // Connect options
-  NSGDONTCARE               : 0x0001, // "don't care"
-  NSGHDX                    : 0x0002, // half-duplex (w/ token management)
-  NSGFDX                    : 0x0004, // full-duplex
-  NSGHDRCHKSUM              : 0x0008, // checksum on packet header
-  NSGPAKCHKSUM              : 0x0010, // checksum on entire packet
-  NSGBROKEN                 : 0x0020, // provide broken connection notification
-  NSGUSEVIO                 : 0x0040, // can use Vectored I/O
-  NSGOSAUTHOK               : 0x0080, // use OS authentication
-  NSGSENDATTN               : 0x0200, // can send attention
-  NSGRECVATTN               : 0x0400, // can recv attention
-  NSGNOATTNPR               : 0x0800, // no attention processing
-  NSGRAW                    : 0x1000, // I/O is direct to/from transport
-  TNS_VERSION_DESIRED       : 319,
-  TNS_VERSION_MINIMUM       : 300,
-  TNS_VERSION_MIN_UUID      : 319,
-  TNS_UUID_OFFSET           : 45,
+  NSGDONTCARE: 0x0001, // "don't care"
+  NSGHDX: 0x0002, // half-duplex (w/ token management)
+  NSGFDX: 0x0004, // full-duplex
+  NSGHDRCHKSUM: 0x0008, // checksum on packet header
+  NSGPAKCHKSUM: 0x0010, // checksum on entire packet
+  NSGBROKEN: 0x0020, // provide broken connection notification
+  NSGUSEVIO: 0x0040, // can use Vectored I/O
+  NSGOSAUTHOK: 0x0080, // use OS authentication
+  NSGSENDATTN: 0x0200, // can send attention
+  NSGRECVATTN: 0x0400, // can recv attention
+  NSGNOATTNPR: 0x0800, // no attention processing
+  NSGRAW: 0x1000, // I/O is direct to/from transport
+  TNS_VERSION_DESIRED: 319,
+  TNS_VERSION_MINIMUM: 300,
+  TNS_VERSION_MIN_UUID: 319,
+  TNS_UUID_OFFSET: 45,
 
   /* Accept Packet */
-  NSPACVSN : 8,   // connection version
-  NSPACOPT : 10,  // global service options
-  NSPACSDU : 12,  // SDU size
-  NSPACTDU : 14,  // Maximum TDU
-  NSPACONE : 16,  // The value '1' in my hardware byte order
-  NSPACLEN : 18,  // connect data length
-  NSPACOFF : 20,  // offset to connect data
-  NSPACFL0 : 22,  // connect flags
-  NSPACFL1 : 23,
-  NSPACTMO : 24,  // connection pool timeout value
-  NSPACTCK : 26,  // local tick size
-  NSPACADL : 28,  // reconnect tns address length
-  NSPACAOF : 30,  // offset to reconnect tns addr
-  NSPACLSD : 32,  // Large sdu
-  NSPACLTD : 36,  // Large tdu
-  NSPACCFL : 40,  // compression flag
-  NSPACFL2 : 41,  // accept flag2 (4 bytes)
-  NSPACV310DAT : 32, /* start of accept data, V3.10     packet */
-  NSPACV315DAT : 41, // start of accept data, V3.15     packet
+  NSPACVSN: 8,   // connection version
+  NSPACOPT: 10,  // global service options
+  NSPACSDU: 12,  // SDU size
+  NSPACTDU: 14,  // Maximum TDU
+  NSPACONE: 16,  // The value '1' in my hardware byte order
+  NSPACLEN: 18,  // connect data length
+  NSPACOFF: 20,  // offset to connect data
+  NSPACFL0: 22,  // connect flags
+  NSPACFL1: 23,
+  NSPACTMO: 24,  // connection pool timeout value
+  NSPACTCK: 26,  // local tick size
+  NSPACADL: 28,  // reconnect tns address length
+  NSPACAOF: 30,  // offset to reconnect tns addr
+  NSPACLSD: 32,  // Large sdu
+  NSPACLTD: 36,  // Large tdu
+  NSPACCFL: 40,  // compression flag
+  NSPACFL2: 41,  // accept flag2 (4 bytes)
+  NSPACV310DAT: 32, /* start of accept data, V3.10     packet */
+  NSPACV315DAT: 41, // start of accept data, V3.15     packet
 
   /* Refuse Packet */
-  NSPRFURS : 8,  // User (appliction) reason for refusal
-  NSPRFSRS : 9,  // System (NS) reason for
-  NSPRFLEN : 10, // Length of refuse data
-  NSPRFDAT : 12, // Start of connect data
+  NSPRFURS: 8,  // User (appliction) reason for refusal
+  NSPRFSRS: 9,  // System (NS) reason for
+  NSPRFLEN: 10, // Length of refuse data
+  NSPRFDAT: 12, // Start of connect data
   // Compression flags
-  NSPACCFON : 0x80, // 1st MSB:  compression on/off
-  NSPACCFAT : 0x40, // 2nd MSB :   compression auto
-  NSPACCFNT : 0x02, // Second last LSB : compression for non-tcp protocol
+  NSPACCFON: 0x80, // 1st MSB:  compression on/off
+  NSPACCFAT: 0x40, // 2nd MSB :   compression auto
+  NSPACCFNT: 0x02, // Second last LSB : compression for non-tcp protocol
   // Accept flag2
-  NSPACOOB     : 0x00000001, // OOB support check at connection time
-  NSGPCHKSCMD  : 0x01000000, // Support for Poll and Check logic
+  NSPACOOB: 0x00000001, // OOB support check at connection time
+  NSGPCHKSCMD: 0x01000000, // Support for Poll and Check logic
 
   /* Redirect packet */
-  NSPRDLEN : 8,   // Length of redirect data
-  NSPRDDAT : 10,  // Start of connect data
+  NSPRDLEN: 8,   // Length of redirect data
+  NSPRDDAT: 10,  // Start of connect data
 
   /* Data Packet */
-  NSPDAFLG  : 8,    // Data flags
-  NSPDADAT  : 10,   // Start of Data
-  NSPDAFEOF : 0x40, // "end of file"
+  NSPDAFLG: 8,    // Data flags
+  NSPDADAT: 10,   // Start of Data
+  NSPDAFEOF: 0x40, // "end of file"
 
   /* Marker Packet */
-  NSPMKTYP : 8,     // marker type (see below)
-  NSPMKODT : 9,     // old (pre-V3.05) data byte
-  NSPMKDAT : 10,    // data byte
-  NSPMKTD0 : 0,     // data marker - 0 data bytes
-  NSPMKTD1 : 1,     // data marker - 1 data byte
-  NSPMKTAT : 2,     // Attention Marker
-  NIQBMARK : 1,     // Break marker
-  NIQRMARK : 2,     // Reset marker
-  NIQIMARK : 3,     // Interrupt marker
+  NSPMKTYP: 8,     // marker type (see below)
+  NSPMKODT: 9,     // old (pre-V3.05) data byte
+  NSPMKDAT: 10,    // data byte
+  NSPMKTD0: 0,     // data marker - 0 data bytes
+  NSPMKTD1: 1,     // data marker - 1 data byte
+  NSPMKTAT: 2,     // Attention Marker
+  NIQBMARK: 1,     // Break marker
+  NIQRMARK: 2,     // Reset marker
+  NIQIMARK: 3,     // Interrupt marker
 
   /* Control Packet */
-  NSPCTLCMD      : 8,  // Control Command length is 2 bytes
-  NSPCTLDAT      : 10, // Control Data length is specific to the Command type.
-  NSPCTL_SERR    : 8,  // Error Control Command Type
-  NSPCTL_CLRATTN : 9,  // Clear OOB option
+  NSPCTLCMD: 8,  // Control Command length is 2 bytes
+  NSPCTLDAT: 10, // Control Data length is specific to the Command type.
+  NSPCTL_SERR: 8,  // Error Control Command Type
+  NSPCTL_CLRATTN: 9,  // Clear OOB option
 
   /* OPTIONS */
-  NSPDFSDULN  : 8192,    // default SDU size
-  NSPABSSDULN : 2097152, // maximim SDU size
-  NSPMXSDULN  : 65535,   // maximim SDU size
-  NSPMNSDULN  : 512,     // minimum SDU size
-  NSPDFTDULN  : 2097152, // default TDU size
-  NSPMXTDULN  : 2097152, // maximum TDU size
-  NSPMNTDULN  : 255,     // minimum TDU size
-  NSFIMM      : 0x0040,  // immediate close
+  NSPDFSDULN: 8192,    // default SDU size
+  NSPABSSDULN: 2097152, // maximim SDU size
+  NSPMXSDULN: 65535,   // maximim SDU size
+  NSPMNSDULN: 512,     // minimum SDU size
+  NSPDFTDULN: 2097152, // default TDU size
+  NSPMXTDULN: 2097152, // maximum TDU size
+  NSPMNTDULN: 255,     // minimum TDU size
+  NSFIMM: 0x0040,  // immediate close
 
   /* PARAMETERS */
-  DISABLE_OOB_STR      : 'DISABLE_OOB', // disable OOB parameter
-  EXPIRE_TIME          : 'EXPIRE_TIME', // expire Time
-  PEM_WALLET_FILE_NAME : 'ewallet.pem',
+  DISABLE_OOB_STR: 'DISABLE_OOB', // disable OOB parameter
+  EXPIRE_TIME: 'EXPIRE_TIME', // expire Time
+  PEM_WALLET_FILE_NAME: 'ewallet.pem',
 
   /* Get/Set options */
-  NT_MOREDATA : 1, // More Data in Transport available
-  NS_MOREDATA : 2, // More Data available to be read
-  SVCNAME     : 3, // Service name
-  SERVERTYPE  : 4, // Server type
-  REMOTEADDR  : 5, // Remote Address
-  HEALTHCHECK : 6, // Health check of connection
-  CONNCLASS   : 7, // Connection Class
-  PURITY      : 8, // Purity
-  SID         : 9, // SID
+  NT_MOREDATA: 1, // More Data in Transport available
+  NS_MOREDATA: 2, // More Data available to be read
+  SVCNAME: 3, // Service name
+  SERVERTYPE: 4, // Server type
+  REMOTEADDR: 5, // Remote Address
+  HEALTHCHECK: 6, // Health check of connection
+  CONNCLASS: 7, // Connection Class
+  PURITY: 8, // Purity
+  SID: 9, // SID
 
   /* FLAGS */
-  NSNOBLOCK : 0x0001, // Do not block
+  NSNOBLOCK: 0x0001, // Do not block
 };

package/lib/thin/sqlnet/navNodes.js

@@ -35,10 +35,10 @@ const dnsPromises = dns.promises;
 const cInfo = require("../util.js").CLIENT_INFO;
 
 const SchemaObjectFactoryInterface = {
-  ADDR:0,
-  ADDR_LIST:1,
-  DESC:2,
-  DESC_LIST:3,
+  ADDR: 0,
+  ADDR_LIST: 1,
+  DESC: 2,
+  DESC_LIST: 3,
 };
 
 /**
@@ -451,7 +451,7 @@ const NavSchemaObject = {
   CONID: "(CONNECTION_ID="
 };
 const options = {
-  all:true,
+  all: true,
 };
 /**
  * Class that navigates the address node in the tree.

package/lib/thin/sqlnet/networkSession.js

@@ -46,6 +46,7 @@ const downHostInstance = require("./connStrategy.js").SOLE_INST_DHCACHE;
 
 async function getConnectionInfo(userConfig) {
   const connStr = await resolveConnectStr(userConfig.connectString, userConfig.configDir);
+  const addressNode = await createNode(connStr);
   let nvpair;
   if (typeof connStr === 'string')
     nvpair = createNVPair(connStr);
@@ -58,7 +59,7 @@ async function getConnectionInfo(userConfig) {
   const sid =   findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "SID"]);
   const poolPurity = findValue(nvpair, ["DESCRIPTION", "CONNECT_DATA", "POOL_PURITY"]);
 
-  return [serverVal, connClass, svcname, poolPurity, sid ];
+  return [serverVal, connClass, svcname, poolPurity, sid, addressNode ];
 }
 
 /**
@@ -510,7 +511,13 @@ class NetworkSession {
   */
   async connect(userConfig) {
     const connStr = userConfig.connectString ? userConfig.connectString : userConfig.connectionString;
-    const addressNode = await resolveAddress(connStr, userConfig.configDir);
+    let addressNode;
+    if (userConfig._connInfo) {
+      addressNode = userConfig._connInfo[5];
+      addressNode.reset();
+    } else {
+      addressNode = await resolveAddress(connStr, userConfig.configDir);
+    }
     let address;
     try {
       address = await this.getAddress(addressNode, userConfig);

package/lib/thin/sqlnet/ntTcp.js

@@ -228,10 +228,10 @@ class NTTCP {
           this.doDNMatch = false; //Don't match initial connect
         try {
           secureContext = tls.createSecureContext({
-            cert : this.atts.wallet,
-            key : this.atts.wallet,
+            cert: this.atts.wallet,
+            key: this.atts.wallet,
             passphrase: this.atts.walletPassword,
-            ca : this.atts.wallet,
+            ca: this.atts.wallet,
           });
         } catch (err) {
           errors.throwErr(errors.ERR_TLS_INIT_FAILURE);
@@ -415,7 +415,7 @@ class NTTCP {
           buf: tempBuf.subarray(0, len),
           type: tempBuf[4],
           flags: tempBuf[5],
-          num : this.packetNum++
+          num: this.packetNum++
         };
         this.packets.push(packet);
         if (this.readWaiter) {
@@ -474,10 +474,10 @@ class NTTCP {
       this.checkErr();
       this.doDNMatch = true;
       const secureContext = tls.createSecureContext({
-        cert : this.atts.wallet,
-        key : this.atts.wallet,
+        cert: this.atts.wallet,
+        key: this.atts.wallet,
         passphrase: this.atts.walletPassword,
-        ca : this.atts.wallet,
+        ca: this.atts.wallet,
       });
       await this.tlsConnect(secureContext, this.connStream);
     } finally {

package/lib/thin/statement.js

@@ -142,7 +142,7 @@ class Parser {
           break;
         }
         inComment = true;
-      } else if (!exitingComment && ch === '*') {
+      } else if (ch === '*') {
         exitingComment = true;
       } else if (exitingComment) {
         if (ch === '/') {

package/lib/thin/util.js

@@ -110,9 +110,9 @@ function checkProxyUserValidity(userName) {
   let quoteFound = false, openSquareBracketFound = false;
   let lastQuoteFoundIndex = 0;
   const result = {
-    status       : -1,
-    proxyUser    : '',
-    schemaUser   : ''
+    status: -1,
+    proxyUser: '',
+    schemaUser: ''
   };
   const userNameLength = userName.length;
   let index = 0, i, j;
@@ -238,10 +238,21 @@ function checkCredentials(params) {
   }
 }
 
+//---------------------------------------------------------------------------
+// normalizePrivateKey()
+//
+// Add header and footer to private key
+//---------------------------------------------------------------------------
+function normalizePrivateKey(privateKey) {
+  return '-----BEGIN PRIVATE KEY-----\n' + privateKey +
+  '\n' + '-----END PRIVATE KEY-----';
+}
+
 module.exports = {
   getMetadataMany,
   CLIENT_INFO,
   getOutBinds,
   checkProxyUserValidity,
-  checkCredentials
+  checkCredentials,
+  normalizePrivateKey
 };

package/lib/types.js

@@ -196,6 +196,9 @@ const DB_TYPE_UROWID = new DbType(2030,
 const DB_TYPE_VARCHAR = new DbType(2001,
   "DB_TYPE_VARCHAR", "VARCHAR2",
   { oraTypeNum: 1, csfrm: constants.CSFRM_IMPLICIT, bufferSizeFactor: 4 });
+const DB_TYPE_XMLTYPE = new DbType(2032,
+  "DB_TYPE_XMLTYPE", "XMLTYPE",
+  { oraTypeNum: 109, csfrm: constants.CSFRM_IMPLICIT, bufferSizeFactor: 2147483647 });
 
 // database type conversion map: the top level key refers to the database
 // type being fetched and the value is another map; this map's key is the
@@ -304,7 +307,8 @@ const DB_TYPE_FETCH_TYPE_MAP = new Map([
   [DB_TYPE_TIMESTAMP_LTZ, DB_TYPE_TIMESTAMP_TZ],
   [DB_TYPE_TIMESTAMP_TZ, DB_TYPE_TIMESTAMP_TZ],
   [DB_TYPE_UROWID, DB_TYPE_UROWID],
-  [DB_TYPE_VARCHAR, DB_TYPE_VARCHAR]
+  [DB_TYPE_VARCHAR, DB_TYPE_VARCHAR],
+  [DB_TYPE_XMLTYPE, DB_TYPE_XMLTYPE]
 ]);
 
 // additional aliases for types by column type name
@@ -351,6 +355,7 @@ module.exports = {
   DB_TYPE_VARCHAR,
   DB_TYPE_CONVERSION_MAP,
   DB_TYPE_FETCH_TYPE_MAP,
+  DB_TYPE_XMLTYPE,
   getTypeByColumnTypeName,
   getTypeByNum,
   getTypeByOraTypeNum