oracledb 6.1.0 → 6.3.0

package/lib/thin/dbObject.js

@@ -32,6 +32,7 @@ const errors = require('../errors.js');
 const types = require('../types.js');
 const DbObjectImpl = require('../impl/dbObject.js');
 const { GrowableBuffer } = require('./protocol/buffer.js');
+const ThinLobImpl = require('./lob.js');
 
 class DbObjectPickleBuffer extends GrowableBuffer {
 
@@ -125,6 +126,16 @@ class DbObjectPickleBuffer extends GrowableBuffer {
     }
   }
 
+  //---------------------------------------------------------------------------
+  // _writeRawBytesAndLength()
+  //
+  // Writes the length in the format required before
+  // writing the bytes.
+  //---------------------------------------------------------------------------
+  _writeRawBytesAndLength(value, numBytes) {
+    this.writeLength(numBytes);
+    this.writeBytes(value);
+  }
 }
 
 class ThinDbObjectImpl extends DbObjectImpl {
@@ -367,7 +378,10 @@ class ThinDbObjectImpl extends DbObjectImpl {
       case types.DB_TYPE_NCHAR:
         return buf.readStr(constants.CSFRM_NCHAR);
       case types.DB_TYPE_RAW:
-        return Buffer.from(buf.readBytesWithLength());
+        value = buf.readBytesWithLength();
+        if (value !== null)
+          value = Buffer.from(value);
+        return value;
       case types.DB_TYPE_BINARY_DOUBLE:
         return buf.readBinaryDouble();
       case types.DB_TYPE_BINARY_FLOAT:
@@ -639,4 +653,37 @@ class ThinDbObjectImpl extends DbObjectImpl {
 
 }
 
-module.exports = ThinDbObjectImpl;
+//---------------------------------------------------------------------------
+// readXML()
+//
+// Decodes the raw Bytes to XML string or LOB object.
+//
+//---------------------------------------------------------------------------
+function readXML(conn, buf) {
+  let colValue;
+
+  const xmlObj = new DbObjectPickleBuffer(buf);
+  const tempobj = {};
+  xmlObj.readHeader(tempobj);
+  xmlObj.skipBytes(1);
+  const xmlflag = xmlObj.readUInt32BE();
+  if (xmlflag & constants.TNS_XML_TYPE_FLAG_SKIP_NEXT_4) {
+    xmlObj.skipBytes(4);
+  }
+  const numBytesLeft = xmlObj.numBytesLeft();
+  const ptr = xmlObj.readBytes(numBytesLeft);
+  if (xmlflag & constants.TNS_XML_TYPE_STRING) {
+    colValue = ptr.toString();
+  } else if (xmlflag & constants.TNS_XML_TYPE_LOB) {
+    const lobImpl = new ThinLobImpl();
+    const locator = Buffer.from(ptr);
+    lobImpl.init(conn, locator, types.DB_TYPE_CLOB, 0, 0);
+    colValue = lobImpl;
+  } else {
+    // We only support String and Clob type.
+    errors.throwErr(errors.ERR_UNEXPECTED_XML_TYPE, xmlflag);
+  }
+  return colValue;
+}
+
+module.exports = { ThinDbObjectImpl, readXML };

package/lib/thin/index.js

@@ -30,7 +30,7 @@ const ThinConnectionImpl = require('./connection.js');
 const ThinResultSetImpl = require('./resultSet.js');
 const ThinPoolImpl = require('./pool.js');
 const ThinLobImpl = require('./lob.js');
-const ThinDbObjectImpl = require('./dbObject.js');
+const { ThinDbObjectImpl } = require('./dbObject.js');
 
 const impl = require('../impl');
 impl.ConnectionImpl = ThinConnectionImpl;

package/lib/thin/pool.js

@@ -102,6 +102,7 @@ class ThinPoolImpl extends PoolImpl {
       this._userConfig.privateKey = null;
     }
     this._accessTokenFn = params.accessTokenFn;
+    this._accessTokenConfig = params.accessTokenConfig;
     this._isDRCPEnabled = false;
     this.eventEmitter = new EventEmitter();
     // listener to remove dead or idle connections
@@ -176,7 +177,7 @@ class ThinPoolImpl extends PoolImpl {
         protocolUtil.getDeobfuscatedValue(this._token, this._obfuscatedToken);
       if (util.isTokenExpired(clonedAttrs.token)) {
         if (typeof this._accessTokenFn === 'function') {
-          accessToken = await this._accessTokenFn(true);
+          accessToken = await this._accessTokenFn(true, this._accessTokenConfig);
           if (typeof accessToken === 'string') {
             clonedAttrs.token = accessToken;
             if (util.isTokenExpired(clonedAttrs.token)) {
@@ -199,7 +200,6 @@ class ThinPoolImpl extends PoolImpl {
               const objToken = protocolUtil.setObfuscatedValue(clonedAttrs.token);
               this._token = objToken.value;
               this._obfuscatedToken = objToken.obfuscatedValue;
-
               const objKey = protocolUtil.setObfuscatedValue(clonedAttrs.privateKey);
               this._privateKey = objKey.value;
               this._obfuscatedPrivateKey = objKey.obfuscatedValue;
@@ -541,6 +541,7 @@ class ThinPoolImpl extends PoolImpl {
 
   // release connection to connection pool
   release(conn) {
+    conn.warning = undefined;
     this._usedConnectionList.delete(conn);
     if (conn.nscon.connected) {
       conn._lastTimeUsed = Date.now();

package/lib/thin/protocol/buffer.js

@@ -49,7 +49,7 @@ class BaseBuffer {
       this.buf = Buffer.alloc(initializer);
       this.size = 0;
       this.maxSize = initializer;
-    } else {
+    } else if (initializer) {
       this.buf = initializer;
       this.size = this.maxSize = initializer.length;
     }
@@ -548,11 +548,12 @@ class BaseBuffer {
   // remain in the buffer, the buffer is grown.
   //---------------------------------------------------------------------------
   reserveBytes(numBytes) {
-    if (numBytes > this.numBytesLeft())
+    if (numBytes > this.numBytesLeft()) {
       this._grow(this.pos + numBytes);
-    const buf = this.buf.subarray(this.pos, this.pos + numBytes);
+    }
+    const pos = this.pos;
     this.pos += numBytes;
-    return buf;
+    return pos;
   }
 
   //---------------------------------------------------------------------------
@@ -618,20 +619,20 @@ class BaseBuffer {
   //---------------------------------------------------------------------------
   writeBinaryDouble(n) {
     this.writeUInt8(8);
-    const buf = this.reserveBytes(8);
-    buf.writeDoubleBE(n);
-    if ((buf[0] & 0x80) === 0) {
-      buf[0] |= 0x80;
+    const pos = this.reserveBytes(8);
+    this.buf.writeDoubleBE(n, pos);
+    if ((this.buf[pos] & 0x80) === 0) {
+      this.buf[pos] |= 0x80;
     } else {
       // We complement the bits for a negative number
-      buf[0] ^= 0xff;
-      buf[1] ^= 0xff;
-      buf[2] ^= 0xff;
-      buf[3] ^= 0xff;
-      buf[4] ^= 0xff;
-      buf[5] ^= 0xff;
-      buf[6] ^= 0xff;
-      buf[7] ^= 0xff;
+      this.buf[pos] ^= 0xff;
+      this.buf[pos + 1] ^= 0xff;
+      this.buf[pos + 2] ^= 0xff;
+      this.buf[pos + 3] ^= 0xff;
+      this.buf[pos + 4] ^= 0xff;
+      this.buf[pos + 5] ^= 0xff;
+      this.buf[pos + 6] ^= 0xff;
+      this.buf[pos + 7] ^= 0xff;
     }
   }
 
@@ -642,16 +643,16 @@ class BaseBuffer {
   //---------------------------------------------------------------------------
   writeBinaryFloat(n) {
     this.writeUInt8(4);
-    const buf = this.reserveBytes(4);
-    buf.writeFloatBE(n);
-    if ((buf[0] & 0x80) === 0) {
-      buf[0] |= 0x80;
+    const pos = this.reserveBytes(4);
+    this.buf.writeFloatBE(n, pos);
+    if ((this.buf[pos] & 0x80) === 0) {
+      this.buf[pos] |= 0x80;
     } else {
       // We complement the bits for a negative number
-      buf[0] ^= 0xff;
-      buf[1] ^= 0xff;
-      buf[2] ^= 0xff;
-      buf[3] ^= 0xff;
+      this.buf[pos] ^= 0xff;
+      this.buf[pos + 1] ^= 0xff;
+      this.buf[pos + 2] ^= 0xff;
+      this.buf[pos + 3] ^= 0xff;
     }
   }
 
@@ -676,15 +677,12 @@ class BaseBuffer {
     }
   }
 
-  //---------------------------------------------------------------------------
-  // writeBytesWithLength()
+  // _writeRawBytesAndLength()
   //
-  // Writes the bytes in the supplied buffer to the buffer, but first writes
-  // the length. If the length exceeds a fixed value, the value is written in
-  // chunks instead.
+  // Writes the length in the format required before
+  // writing the bytes.
   //---------------------------------------------------------------------------
-  writeBytesWithLength(value) {
-    let numBytes = value.length;
+  _writeRawBytesAndLength(value, numBytes) {
     if (numBytes <= constants.TNS_MAX_SHORT_LENGTH) {
       this.writeUInt8(numBytes);
       if (numBytes > 0) {
@@ -703,6 +701,17 @@ class BaseBuffer {
       this.writeUB4(0);
     }
   }
+  //---------------------------------------------------------------------------
+  // writeBytesWithLength()
+  //
+  // Writes the bytes in the supplied buffer to the buffer, but first writes
+  // the length. If the length exceeds a fixed value, the value is written in
+  // chunks instead.
+  //---------------------------------------------------------------------------
+  writeBytesWithLength(value) {
+    const numBytes = value.length;
+    this._writeRawBytesAndLength(value, numBytes);
+  }
 
   //---------------------------------------------------------------------------
   // writeDbObject()
@@ -745,31 +754,31 @@ class BaseBuffer {
     if (writeLength) {
       this.writeUInt8(length);
     }
-    const ptr = this.reserveBytes(length);
+    const pos = this.reserveBytes(length);
     if (type === types.DB_TYPE_DATE || type == types.DB_TYPE_TIMESTAMP) {
       const year = date.getFullYear();
-      ptr[0] = Math.trunc(year / 100) + 100;
-      ptr[1] = year % 100 + 100;
-      ptr[2] = date.getMonth() + 1;
-      ptr[3] = date.getDate();
-      ptr[4] = date.getHours() + 1;
-      ptr[5] = date.getMinutes() + 1;
-      ptr[6] = date.getSeconds() + 1;
+      this.buf[pos] = Math.trunc(year / 100) + 100;
+      this.buf[pos + 1] = year % 100 + 100;
+      this.buf[pos + 2] = date.getMonth() + 1;
+      this.buf[pos + 3] = date.getDate();
+      this.buf[pos + 4] = date.getHours() + 1;
+      this.buf[pos + 5] = date.getMinutes() + 1;
+      this.buf[pos + 6] = date.getSeconds() + 1;
     } else {
       const year = date.getUTCFullYear();
-      ptr[0] = Math.trunc(year / 100) + 100;
-      ptr[1] = year % 100 + 100;
-      ptr[2] = date.getUTCMonth() + 1;
-      ptr[3] = date.getUTCDate();
-      ptr[4] = date.getUTCHours() + 1;
-      ptr[5] = date.getUTCMinutes() + 1;
-      ptr[6] = date.getUTCSeconds() + 1;
+      this.buf[pos] = Math.trunc(year / 100) + 100;
+      this.buf[pos + 1] = year % 100 + 100;
+      this.buf[pos + 2] = date.getUTCMonth() + 1;
+      this.buf[pos + 3] = date.getUTCDate();
+      this.buf[pos + 4] = date.getUTCHours() + 1;
+      this.buf[pos + 5] = date.getUTCMinutes() + 1;
+      this.buf[pos + 6] = date.getUTCSeconds() + 1;
     }
     if (length > 7) {
-      ptr.writeInt32BE(fsec, 7);
+      this.buf.writeInt32BE(fsec, pos + 7);
       if (length > 11) {
-        ptr[11] = constants.TZ_HOUR_OFFSET;
-        ptr[12] = constants.TZ_MINUTE_OFFSET;
+        this.buf[pos + 11] = constants.TZ_HOUR_OFFSET;
+        this.buf[pos + 12] = constants.TZ_MINUTE_OFFSET;
       }
     }
   }
@@ -843,19 +852,19 @@ class BaseBuffer {
     } else if (value.length === 0 && exponent === 0) {
       exponentOnWire = 128;
     }
-    const buf = this.reserveBytes(numPairs + 2 + appendSentinel);
-    buf[0] = numPairs + 1 + appendSentinel;
-    buf[1] = exponentOnWire;
-    for (let i = 0, pos = 2; i < value.length; i += 2, pos++) {
+    let pos = this.reserveBytes(numPairs + 2 + appendSentinel);
+    this.buf[pos++] = numPairs + 1 + appendSentinel;
+    this.buf[pos++] = exponentOnWire;
+    for (let i = 0; i < value.length; i += 2) {
       const base100Digit = Number(value.substring(i, i + 2));
       if (isNegative) {
-        buf[pos] = 101 - base100Digit;
+        this.buf[pos++] = 101 - base100Digit;
       } else {
-        buf[pos] = base100Digit + 1;
+        this.buf[pos++] = base100Digit + 1;
       }
     }
     if (appendSentinel) {
-      buf[buf.length - 1] = 102;
+      this.buf[pos] = 102;
     }
 
   }
@@ -898,8 +907,8 @@ class BaseBuffer {
   // Writes a signed 32-bit integer to the buffer in big endian order.
   //---------------------------------------------------------------------------
   writeInt32BE(n) {
-    const buf = this.reserveBytes(4);
-    buf.writeInt32BE(n);
+    const pos = this.reserveBytes(4);
+    this.buf.writeInt32BE(n, pos);
   }
 
   //---------------------------------------------------------------------------
@@ -971,8 +980,8 @@ class BaseBuffer {
   // Writes an unsigned 8-bit integer to the buffer.
   //---------------------------------------------------------------------------
   writeUInt8(n) {
-    const buf = this.reserveBytes(1);
-    buf[0] = n;
+    const pos = this.reserveBytes(1);
+    this.buf[pos] = n;
   }
 
   //---------------------------------------------------------------------------
@@ -981,8 +990,8 @@ class BaseBuffer {
   // Writes an unsigned 16-bit integer to the buffer in big endian order.
   //---------------------------------------------------------------------------
   writeUInt16BE(n) {
-    const buf = this.reserveBytes(2);
-    buf.writeUInt16BE(n);
+    const pos = this.reserveBytes(2);
+    this.buf.writeUInt16BE(n, pos);
   }
 
   //---------------------------------------------------------------------------
@@ -991,8 +1000,8 @@ class BaseBuffer {
   // Writes an unsigned 32-bit integer to the buffer in big endian order.
   //---------------------------------------------------------------------------
   writeUInt32BE(n) {
-    const buf = this.reserveBytes(4);
-    buf.writeUInt32BE(n);
+    const pos = this.reserveBytes(4);
+    this.buf.writeUInt32BE(n, pos);
   }
 
   //---------------------------------------------------------------------------
@@ -1003,9 +1012,9 @@ class BaseBuffer {
   // higher order bits are simply written as 0.
   //---------------------------------------------------------------------------
   writeUInt64BE(n) {
-    const buf = this.reserveBytes(8);
-    buf.writeUInt32BE(0);
-    buf.writeUInt32BE(n, 4);
+    const pos = this.reserveBytes(8);
+    this.buf.writeUInt32BE(0, pos);
+    this.buf.writeUInt32BE(n, pos + 4);
   }
 
   //---------------------------------------------------------------------------
@@ -1014,8 +1023,8 @@ class BaseBuffer {
   // Writes an unsigned 16-bit integer to the buffer in little endian order.
   //---------------------------------------------------------------------------
   writeUInt16LE(n) {
-    const buf = this.reserveBytes(2);
-    buf.writeUInt16LE(n);
+    const pos = this.reserveBytes(2);
+    this.buf.writeUInt16LE(n, pos);
   }
 
 }
@@ -1048,7 +1057,7 @@ class GrowableBuffer extends BaseBuffer {
     if (remainder > 0) {
       numBytes += (constants.BUFFER_CHUNK_SIZE - remainder);
     }
-    const buf = Buffer.alloc(numBytes);
+    const buf = Buffer.allocUnsafe(numBytes);
     this.buf.copy(buf);
     this.buf = buf;
     this.maxSize = this.size = numBytes;

package/lib/thin/protocol/capabilities.js

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

package/lib/thin/protocol/constants.js

@@ -56,14 +56,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 +120,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,7 +194,7 @@ 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,
@@ -381,7 +381,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 +400,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,
@@ -622,7 +625,12 @@ 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_MAX: 23,
   TNS_CCAP_O5LOGON: 8,
   TNS_CCAP_O5LOGON_NP: 2,
   TNS_CCAP_O7LOGON: 32,
@@ -642,7 +650,10 @@ 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,
@@ -667,6 +678,9 @@ module.exports = {
   /** MultiRound SHA-512. */
   TNS_VERIFIER_TYPE_12C: 0x4815,
 
+  // UDS flags
+  TNS_UDS_FLAGS_IS_JSON: 0x00000100,
+
   // other constants
   TNS_MAX_SHORT_LENGTH: 252,
   TNS_ESCAPE_CHAR: 253,
@@ -743,6 +757,9 @@ module.exports = {
   TNS_ERR_NO_DATA_FOUND: 1403,
   TNS_ERR_SESSION_SHUTDOWN: 12572,
 
+  // warnings
+  TNS_WARN_COMPILATION_CREATE: 0x20,
+
   // other constants
   PACKET_HEADER_SIZE: 8,
   NUMBER_AS_TEXT_CHARS: 172,
@@ -750,6 +767,6 @@ module.exports = {
   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']);
+      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

@@ -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
@@ -132,28 +135,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) {
@@ -448,6 +463,13 @@ class Message {
     }
     return writtenBytes;
   }
+
+  // Called when an error is encountered during decode of RPC
+  saveDeferredErr() {
+    if (!this.deferredErr) {
+      this.deferredErr = errors.getErr(...arguments);
+    }
+  }
 }
 
 module.exports = Message;