oracledb 6.8.0 → 6.10.0

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -30,6 +30,34 @@ const { Buffer } = require('buffer');
 const constants = require("../constants.js");
 const errors = require("../../../errors.js");
 
+// List of recoverable errors
+const RECOVERABLE_ERRORS = new Set([
+  28,     // session has been terminated
+  31,     // session marked for kill
+  376,    // file %s cannot be read at this time
+  603,    // ORACLE server session terminated
+  1012,   // not logged on
+  1033,   // ORACLE initialization or shutdown in progress
+  1034,   // the Oracle instance is not available for use
+  1089,   // immediate shutdown or close in progress
+  1090,   // shutdown in progress
+  1092,   // ORACLE instance terminated
+  1115,   // IO error reading block from file %s (block # %s)
+  2396,   // exceeded maximum idle time
+  3113,   // end-of-file on communication channel
+  3114,   // not connected to ORACLE
+  3135,   // connection lost contact
+  12153,  // TNS:not connected
+  12514,  // Service %s is not registered with the listener
+  12537,  // TNS:connection closed
+  12547,  // TNS:lost contact
+  12570,  // TNS:packet reader failure
+  12571,  // TNS:packet writer failure
+  12583,  // TNS:no reader
+  12757,  // instance does not currently know of requested service
+  16456   // missing or invalid value
+]);
+
 /**
  *
  * Base class for all the RPC messages to support encode/decode functions
@@ -52,6 +80,7 @@ class Message {
   async postProcess() { }
 
   writeFunctionHeader(buf) {
+    this.writePiggybacks(buf);
     buf.writeUInt8(this.messageType);
     buf.writeUInt8(this.functionCode);
     buf.writeSeqNum();
@@ -160,6 +189,8 @@ class Message {
        */
       this.errorInfo.message = this.errorInfo.message.trim();
     }
+    this.errorInfo.isRecoverable = RECOVERABLE_ERRORS.has(this.errorInfo.num);
+
     this.endOfResponse = !this.connection.nscon.endOfRequestSupport;
   }
 
@@ -220,7 +251,7 @@ class Message {
     if (opcode === constants.TNS_SERVER_PIGGYBACK_LTXID) {
       const num_bytes = buf.readUB4();
       if (num_bytes > 0) {
-        buf.skipBytesChunked();
+        this.connection._ltxid = Buffer.from(buf.readBytesWithLength());
       }
     } else if ((opcode === constants.TNS_SERVER_PIGGYBACK_QUERY_CACHE_INVALIDATION)
      || (opcode === constants.TNS_SERVER_PIGGYBACK_TRACE_EVENT)) {
@@ -235,15 +266,22 @@ class Message {
       const num_elements = buf.readUB4();
       buf.skipBytes(1);                         // skip length
       for (let i = 0; i < num_elements; i++) {
-        let temp16 = buf.readUB2();
-        if (temp16 > 0) {                       // skip key
-          buf.skipBytesChunked();
+        let numBytes = buf.readUB2();
+        let keyTextValue, value;
+        if (numBytes > 0) {                       // read key
+          keyTextValue = buf.readStr(constants.CSFRM_IMPLICIT);
         }
-        temp16 = buf.readUB2();
-        if (temp16 > 0) {                       // skip value
-          buf.skipBytesChunked();
+        numBytes = buf.readUB2();
+        if (numBytes > 0)                         // read value
+          value = buf.readBytesWithLength();
+        const keywordNum = buf.readUB2();         // read keyword number
+        if (keywordNum == constants.TNS_KEYWORD_NUM_TRANSACTION_ID) {
+          this._updateSessionlessTxnState(value);
+        } else if (keywordNum === constants.TNS_KEYWORD_NUM_CURRENT_SCHEMA) {
+          this.connection.currentSchema = keyTextValue;
+        } else if (keywordNum === constants.TNS_KEYWORD_NUM_EDITION) {
+          this.connection._edition = keyTextValue;
         }
-        buf.skipUB2();                          // skip flags
       }
       buf.skipUB4();                            // skip overall flags
     } else if (opcode === constants.TNS_SERVER_PIGGYBACK_EXT_SYNC) {
@@ -286,12 +324,22 @@ class Message {
       this.connection._drcpEstablishSession = false;
       buf.skipUB4();                            // session id
       buf.skipUB2();                            // serial number
+    } else if (opcode === constants.TNS_SERVER_PIGGYBACK_SESS_SIGNATURE) {
+      buf.skipUB2();                              // number of dtys
+      buf.skipUB1();                              // length of dty
+      buf.skipUB8();                              // signature flags
+      buf.skipUB8();                              // client signature
+      buf.skipUB8();                              // server signature
     } else {
       errors.throwErr(errors.ERR_UNKOWN_SERVER_SIDE_PIGGYBACK, opcode);
     }
   }
 
   writePiggybacks(buf) {
+    // Don't write piggybacks if not authenticated yet
+    if (this.connection._protocol.connInProgress)
+      return;
+
     if (this.connection._currentSchemaModified) {
       this._writeCurrentSchemaPiggyback(buf);
     }
@@ -313,6 +361,11 @@ class Message {
     if (this.connection._tempLobsTotalSize > 0) {
       this.writeCloseTempLobsPiggyback(buf);
     }
+    if (this.connection._sessionlessData?.pending) {
+      this.connection._sessionlessData.pending = false;
+      this.connection._sessionlessData.piggyback.encode(buf);
+      this.connection._sessionlessData.piggyback = null;
+    }
   }
 
   writePiggybackHeader(buf, functionCode) {
@@ -474,6 +527,42 @@ class Message {
       this.deferredErr = errors.getErr(...arguments);
     }
   }
+
+  _updateSessionlessTxnState(buf) {
+    const length = buf.length;
+    const sessionlessState = buf.readUInt8(length - 2);
+    const syncVersion = buf.readUInt8(length - 1);
+    let startedOnServer;
+
+    if (syncVersion == constants.TNS_TPC_TRANS_TRANSACTION_ID_SYNC_VERSION_1) {
+      // transactionId got unset for this session (txn ended or suspended)
+      if (sessionlessState &
+        constants.TNS_TPC_TRANS_TRANSACTION_ID_SYNC_UNSET) {
+        this.connection._sessionlessData = null;
+        this.connection._protocol.txnInProgress = false;
+      // transactionId got set for this session
+      } else if (sessionlessState &
+        constants.TNS_TPC_TRANS_TRANSACTION_ID_SYNC_SET) {
+
+        // transaction initialized by PL/SQL procedure
+        if (sessionlessState &
+            constants.TNS_TPC_TRANS_TRANSACTION_ID_SYNC_SERVER)
+          startedOnServer = true;
+        // transaction initialized by calling client API(RPC call)
+        else if (sessionlessState &
+          constants.TNS_TPC_TRANS_TRANSACTION_ID_SYNC_CLIENT)
+          startedOnServer = false;
+
+        this.connection._sessionlessData = {
+          startedOnServer: startedOnServer,
+        };
+        this.connection._protocol.txnInProgress = true;
+      }
+    } else
+      errors.throwErr(errors.ERR_INTERNAL, 'Unexpected TransactionId sync ' +
+        'version in session sync piggyback.');
+  }
+
 }
 
 module.exports = Message;

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -394,6 +394,7 @@ const dataTypes = [
   [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_SESSSIGN, constants.TNS_DATA_TYPE_SESSSIGN, constants.TNS_TYPE_REP_UNIVERSAL],
   [constants.TNS_DATA_TYPE_VECTOR, constants.TNS_DATA_TYPE_VECTOR, constants.TNS_TYPE_REP_UNIVERSAL]
 ];
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -29,6 +29,7 @@
 const MessageWithData = require("./withData.js");
 const constants = require("../constants.js");
 const errors = require("../../../errors.js");
+const TransactionSwitchMessage = require("./transactionSwitch.js");
 
 /**
  *
@@ -110,12 +111,18 @@ class ExecuteMessage extends MessageWithData {
       options |= constants.TNS_EXEC_OPTION_BATCH_ERRORS;
     }
     if (this.arrayDmlRowCounts) {
-      dmlOptions = constants.TNS_EXEC_OPTION_DML_ROWCOUNTS;
+      dmlOptions |= constants.TNS_EXEC_OPTION_DML_ROWCOUNTS;
     }
     if (this.options.autoCommit) {
       options |= constants.TNS_EXEC_OPTION_COMMIT;
     }
-    this.writePiggybacks(buf);
+
+    // In case SuspendOnSuccess is set for execute and a sessionless transaction
+    // is active we add a piggyback for post-call suspend
+    if (this.options.suspendOnSuccess) {
+      this._handleSuspendSessionless();
+    }
+
     this.writeFunctionHeader(buf);
     buf.writeUB4(options);                           // execute options
     buf.writeUB4(stmt.cursorId);                     // cursor id
@@ -258,7 +265,13 @@ class ExecuteMessage extends MessageWithData {
       }
       numIters = this.numExecs;
     }
-    this.writePiggybacks(buf);
+
+    // In case SuspendOnSuccess is set for execute and a sessionless transaction
+    // is active we add a piggyback for post-call suspend
+    if (this.options.suspendOnSuccess) {
+      this._handleSuspendSessionless();
+    }
+
     this.writeFunctionHeader(buf);
     buf.writeUB4(stmt.cursorId);
     buf.writeUB4(numIters);
@@ -267,6 +280,35 @@ class ExecuteMessage extends MessageWithData {
     return params;
   }
 
+  //-------------------------------------------------------------------------
+  // _handleSuspendSessionless()
+  //
+  // Suspend the active sessionless transaction after DML execution if
+  // suspendOnSuccess option was given to execute()
+  //-------------------------------------------------------------------------
+  _handleSuspendSessionless() {
+    const sessionlessData = this.connection._sessionlessData;
+    // If sessionless transaction was started by server-call we cannot suspend
+    // using client API(RPC) calls
+    this.connection._validateSessionlessState();
+
+    if (!sessionlessData)
+      errors.throwErr(errors.ERR_SESSIONLESS_INACTIVE);
+    // If a piggybacks already exists it is most likely a start/resume for a
+    // sessionless transaction, add a post-call detach opcode to it
+    if (sessionlessData.piggyback) {
+      sessionlessData.piggyback.operation |=
+        constants.TNS_TPC_TXN_POST_DETACH;
+    } else {
+      const message = new TransactionSwitchMessage(this.connection);
+      message.operation = constants.TNS_TPC_TXN_POST_DETACH;
+      message.flags = constants.TNS_TPC_TRANS_SESSIONLESS;
+      message.messageType = constants.TNS_MSG_TYPE_PIGGYBACK;
+      sessionlessData.piggyback = message;
+      sessionlessData.pending = true;
+    }
+  }
+
   //-------------------------------------------------------------------------
   // encode()
   //

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -45,10 +45,6 @@ class LobOpMessage extends Message {
      */
     this.sourceLobImpl = options.sourceLobImpl || null;
     this.operation = options.operation;
-    /*
-     * Destination LOB locator. For copy, append operations,...
-     */
-    this.destLobImpl = options.destLobImpl || null;
     /*
      * Offset from where sourceLob operation to start
      */
@@ -64,6 +60,7 @@ class LobOpMessage extends Message {
     this.functionCode = constants.TNS_FUNC_LOB_OP;
     this.sendAmount = options.sendAmount;
     this.amount = options.amount || 0; // LOB length
+    this.destLength = options.destLength || 0;
   }
 
   encode(buf) {
@@ -75,13 +72,8 @@ class LobOpMessage extends Message {
       buf.writeUInt8(1);
       buf.writeUB4(this.sourceLobImpl._locator.length);
     }
-    if (this.destLobImpl === null) {
-      buf.writeUInt8(0);
-      buf.writeUB4(0);
-    } else {
-      buf.writeUInt8(1);
-      buf.writeUB4(this.destLobImpl._locator.length);
-    }
+    buf.writeUInt8(0);
+    buf.writeUB4(this.destLength);
     buf.writeUB4(0);
     buf.writeUB4(0);
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
@@ -117,9 +109,6 @@ class LobOpMessage extends Message {
     if (this.sourceLobImpl) {
       buf.writeBytes(this.sourceLobImpl._locator);
     }
-    if (this.destLobImpl) {
-      buf.writeBytes(this.destLobImpl._locator);
-    }
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
       if (this.sourceLobImpl.dbType._csfrm === constants.CSFRM_NCHAR) {
         buf.caps.checkNCharsetId();
@@ -185,15 +174,9 @@ class LobOpMessage extends Message {
       locator = lobArray.slice(0, numBytes);
       locator.copy(this.sourceLobImpl._locator);
     }
-    if (this.destLobImpl !== null) {
-      numBytes = this.destLobImpl._locator.length;
-      lobArray = buf.readBytes(numBytes);
-      locator = lobArray.slice(0, numBytes);
-      locator.copy(this.destLobImpl._locator);
-    }
     if (this.operation === constants.TNS_LOB_OP_CREATE_TEMP) {
       buf.skipUB2();        // skip character set
-      buf.skipBytes(3);     // skip trailing flags, amount
+      buf.skipUB1();        // skip trailing flags
     } else if (this.sendAmount) {
       this.amount = buf.readSB8();
     }

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

@@ -44,7 +44,6 @@ class LogOffMessage extends Message {
   }
 
   encode(buf) {
-    this.writePiggybacks(buf);
     this.writeFunctionHeader(buf);
   }
 

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

@@ -45,7 +45,6 @@ class SessionReleaseMessage extends Message {
   }
 
   encode(buf) {
-    this.writePiggybacks(buf);
     this.writeFunctionHeader(buf);
     buf.writeUInt8(0); // pointer (tag name)
     buf.writeUInt8(0); // tag name length

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

@@ -28,6 +28,7 @@
 
 const Message = require("./base.js");
 const constants = require("../constants.js");
+const errors = require("../../../errors.js");
 
 /**
  * Used for two-phase commit (TPC) transaction start, attach and detach.
@@ -61,18 +62,25 @@ class TransactionSwitchMessage extends Message {
   }
 
   encode(buf) {
+    // We unset the pending flag in writePiggybacks just before encode is
+    // called to ensure message is written
+    if (this.connection._sessionlessData?.pending)
+      errors.throwErr(errors.ERR_SESSIONLESS_ALREADY_ACTIVE);
+
     // writes the message to the database
     // acquire data to send to the server
     let xidBytes;
     if (this.xid) {
       xidBytes = Buffer.alloc(128);
       this.xid.globalTransactionId.copy(xidBytes);
-      this.xid.branchQualifier.copy(xidBytes,
-        this.xid.globalTransactionId.length);
+      if (this.xid.branchQualifier)
+        this.xid.branchQualifier.copy(xidBytes,
+          this.xid.globalTransactionId.length);
     }
 
-    // write message
     this.writeFunctionHeader(buf);
+
+
     buf.writeUB4(this.operation);
     if (this.context) {
       buf.writeUInt8(1);  // pointer (transaction context)
@@ -97,7 +105,7 @@ class TransactionSwitchMessage extends Message {
     }
 
     buf.writeUB4(this.flags);
-    buf.writeUB4(this.timeout);
+    buf.writeUB4(this.timeout ? this.timeout : 0);
     buf.writeUInt8(1);   // pointer (application value)
     buf.writeUInt8(1);   // pointer (return context)
     buf.writeUInt8(1);   // pointer (return context length)

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

@@ -156,7 +156,6 @@ class MessageWithData extends Message {
     if (statement.numQueryVars > 0) {
       buf.skipUB1();
     }
-    resultSet.metadata = [];
     const metadata = [];
     const queryVars = [];
     for (let i = 0; i < statement.numQueryVars; i++) {
@@ -185,7 +184,7 @@ class MessageWithData extends Message {
      * at end of the DescribeInfo function so that an OutOfPacketsError
      * won't cause partial information state to be stored.
      */
-    resultSet.metadata = metadata;
+    resultSet.metaData = metadata;
     statement.queryVars = queryVars;
     this.resultSetsToSetup.push(resultSet);
   }
@@ -236,6 +235,7 @@ class MessageWithData extends Message {
     // build metadata
     const fetchInfo = {
       name: name,
+      dbColumnName: name,
       dbType: types.getTypeByOraTypeNum(dataType, csfrm),
       nullable: nullable
     };
@@ -628,7 +628,7 @@ class MessageWithData extends Message {
     }
     await this.connection._populatePartialDbObjectTypes();
     for (const resultSet of this.resultSetsToSetup) {
-      resultSet._setup(this.options, resultSet.metadata);
+      resultSet._setup(this.options, resultSet.metaData);
       // LOBs always require define and they change the type that is actually
       // returned by the server
       for (const variable of resultSet.statement.queryVars) {

package/lib/thin/protocol/packet.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -576,10 +576,10 @@ class WritePacket extends BaseBuffer {
    * Encodes a JavaScript object into OSON and then writes it (QLocator
    * followed by data) to the buffer.
    */
-  writeOson(value, osonMaxFieldSize) {
+  writeOson(value, osonMaxFieldSize, writeLength = true) {
     const encoder = new oson.OsonEncoder();
     const buf = encoder.encode(value, osonMaxFieldSize);
-    this.writeQLocator(buf.length);
+    this.writeQLocator(buf.length, writeLength);
     this.writeBytesWithLength(buf);
   }
 
@@ -604,9 +604,10 @@ class WritePacket extends BaseBuffer {
   //
   // Writes a QLocator. QLocators are always 40 bytes in length.
   //---------------------------------------------------------------------------
-  writeQLocator(numBytes) {
+  writeQLocator(numBytes, writeLength = true) {
     this.writeUB4(40);                  // QLocator length
-    this.writeUInt8(40);                // repeated length
+    if (writeLength)
+      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 |

package/lib/thin/protocol/protocol.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -204,6 +204,7 @@ class Protocol {
       let err = new Error(message.errorInfo.message);
       err.offset = message.errorInfo.pos;
       err.errorNum = message.errorInfo.num;
+      err.isRecoverable = message.errorInfo.isRecoverable;
       err = errors.transformErr(err);
       if (err.code === errors.ERR_CONNECTION_CLOSED_CODE) {
         this.nsi.disconnect();

package/lib/thin/sqlnet/connStrategy.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -194,6 +194,7 @@ async function createNode(str, userConfig) {
   cs.terminal = userConfig.terminal;
   cs.osUser = userConfig.osUser;
   cs.program = userConfig.program;
+  cs.httpsProxy = userConfig.httpsProxy;
   await navobj.navigate(cs);
   return cs;
 }

package/lib/thin/sqlnet/navNodes.js

@@ -500,7 +500,7 @@ class NavAddress extends Address {
       cs.newConnectionDescription();
       needToCloseDescription = true;
     }
-    if (!net.isIP(this.host)) {
+    if (!net.isIP(this.host) && !(cs.httpsProxy || this.httpsProxy)) {
       try {
         addresses = await dnsPromises.lookup(this.host, options);
         for (const addr of addresses) {

package/lib/thin/sqlnet/networkSession.js

@@ -298,7 +298,6 @@ class NetworkSession {
 
     /* Accepted  */
 
-    this.connected = true;
     this.cData = null;
     this.sndDatapkt = new Packet.DataPacket(this.sAtts.largeSDU);
     this.markerPkt = new Packet.MarkerPacket(this.sAtts.largeSDU);
@@ -319,6 +318,7 @@ class NetworkSession {
     this.sndDatapkt.createPacket(constants.NSPDADAT); //Currently only used for disconnect
     this.sndDatapkt.offset = this.sndDatapkt.dataPtr;
     this.sndDatapkt.len = this.sndDatapkt.bufLen;
+    this.connected = true;
     return (true);
   }
 
@@ -374,9 +374,9 @@ class NetworkSession {
           const buffertoDeCompress = packet.buf.subarray(constants.NSPDADAT, size);
           let deCompressedDataBuffer;
           try {
-            if (this.sAtts.firstCompressedPacket) {
+            if (this.sAtts.firstRecvCompressedPacket) {
               deCompressedDataBuffer = zlib.inflateSync(buffertoDeCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
-              this.sAtts.firstCompressedPacket = 0;
+              this.sAtts.firstRecvCompressedPacket = 0;
             } else {
               deCompressedDataBuffer = zlib.inflateRawSync(buffertoDeCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
             }
@@ -457,7 +457,13 @@ class NetworkSession {
         const bufferHeader = buf.subarray(0, constants.NSPDADAT);
         let compressedDataBuffer;
         try {
-          compressedDataBuffer = zlib.deflateSync(buffertoCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
+          if (this.sAtts.firstSendCompressedPacket) {
+            compressedDataBuffer = zlib.deflateSync(buffertoCompress, {finishFlush: zlib.
+              constants.Z_SYNC_FLUSH});
+            this.sAtts.firstSendCompressedPacket = 0;
+          } else {
+            compressedDataBuffer = zlib.deflateRawSync(buffertoCompress, {finishFlush: zlib.constants.Z_SYNC_FLUSH});
+          }
         } catch (err) {
           errors.throwErr(errors.ERR_DATA_COMPRESSION, err.message);
         }

package/lib/thin/sqlnet/packet.js

@@ -258,7 +258,8 @@ function AcceptPacket(packet, sAtts) {
     if ((this.cflag & constants.NSPACCFON) != 0) { // compression ON
       sAtts.negotiatedNetworkCompressionScheme = (this.cflag & 0x3c) >> 2; // 0x3c
       sAtts.networkCompressionEnabled = true;
-      sAtts.firstCompressedPacket = true;
+      sAtts.firstRecvCompressedPacket = true;
+      sAtts.firstSendCompressedPacket = true;
     } else {
       sAtts.networkCompressionEnabled = false;
     }

package/lib/thin/sqlnet/sessionAtts.js

@@ -62,6 +62,7 @@ class SessionAtts {
     this.nt.sslServerDNMatch = true;
     this.nt.sslAllowWeakDNMatch = false;
     this.nt.useSNI = false;
+    this.networkCompressionThreshold = 1024;
   }
 
   /**
@@ -85,9 +86,7 @@ class SessionAtts {
       }
       if (params.networkCompressionThreshold >= 200) {
         this.networkCompressionThreshold = parseInt(params.networkCompressionThreshold);
-      } else
-        this.networkCompressionThreshold = 1024;
-
+      }
 
       if (typeof params.walletLocation === 'string') {
         this.nt.walletFile = path.join(params.walletLocation, constants.PEM_WALLET_FILE_NAME);

package/lib/types.js

@@ -46,7 +46,7 @@ class DbType {
     this._oraTypeNum = options.oraTypeNum || 0;
     this._csfrm = options.csfrm || 0;
     dbTypeByNum.set(num, this);
-    const key = (options.csfrm || 0) * 256 + options.oraTypeNum;
+    const key = this._csfrm * 256 + this._oraTypeNum;
     dbTypeByOraTypeNum.set(key, this);
     dbTypeByColumnTypeName.set(columnTypeName, this);
   }
@@ -322,14 +322,9 @@ const DB_TYPE_FETCH_TYPE_MAP = new Map([
 ]);
 
 // additional aliases for types by column type name
-dbTypeByColumnTypeName.set("DOUBLE PRECISION", DB_TYPE_NUMBER);
-dbTypeByColumnTypeName.set("FLOAT", DB_TYPE_NUMBER);
-dbTypeByColumnTypeName.set("INTEGER", DB_TYPE_NUMBER);
 dbTypeByColumnTypeName.set("PL/SQL BOOLEAN", DB_TYPE_BOOLEAN);
 dbTypeByColumnTypeName.set("PL/SQL BINARY INTEGER", DB_TYPE_BINARY_INTEGER);
 dbTypeByColumnTypeName.set("PL/SQL PLS INTEGER", DB_TYPE_BINARY_INTEGER);
-dbTypeByColumnTypeName.set("REAL", DB_TYPE_NUMBER);
-dbTypeByColumnTypeName.set("SMALLINT", DB_TYPE_NUMBER);
 dbTypeByColumnTypeName.set("TIMESTAMP WITH LOCAL TZ", DB_TYPE_TIMESTAMP_LTZ);
 dbTypeByColumnTypeName.set("TIMESTAMP WITH TZ", DB_TYPE_TIMESTAMP_TZ);
 
@@ -530,8 +525,8 @@ class IntervalYM {
       errors.assertParamPropInt(obj, 1, "years");
       errors.assertParamPropInt(obj, 1, "months");
     }
-    this.years = obj?.years || 0;
     this.months = obj?.months || 0;
+    this.years = obj?.years || 0;
   }
 }
 
@@ -545,11 +540,11 @@ class IntervalDS {
       errors.assertParamPropInt(obj, 1, "seconds");
       errors.assertParamPropInt(obj, 1, "fseconds");
     }
-    this.days = obj?.days || 0;
-    this.hours = obj?.hours || 0;
-    this.minutes = obj?.minutes || 0;
-    this.seconds = obj?.seconds || 0;
     this.fseconds = obj?.fseconds || 0;
+    this.seconds = obj?.seconds || 0;
+    this.minutes = obj?.minutes || 0;
+    this.hours = obj?.hours || 0;
+    this.days = obj?.days || 0;
   }
 }