oracledb 6.10.0 → 7.0.0

package/lib/pool.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2016, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -34,6 +34,7 @@ const settings = require('./settings.js');
 const nodbUtil = require('./util.js');
 const impl = require('./impl');
 const PoolStatistics = require('./poolStatistics.js');
+const traceHandler = require('./traceHandler.js');
 
 class Pool extends EventEmitter {
 
@@ -289,6 +290,7 @@ class Pool extends EventEmitter {
       this._bgRequestWaiter();
 
     this.emit('_afterPoolClose');
+    traceHandler.getTraceInstance()?.onPoolClose(this);
 
   }
 
@@ -428,6 +430,7 @@ class Pool extends EventEmitter {
         // Queueing our request
         request.wasQueued = true;
         this._pendingRequestQueue.add(request);
+        traceHandler.getTraceInstance()?.onPoolWait(this);
 
         if (this._enableStatistics) {
           this._totalRequestsEnqueued += 1;
@@ -445,6 +448,7 @@ class Pool extends EventEmitter {
           this._pendingRequestQueue.delete(request);
           if (this.enableStatistics)
             this._totalRequestTimeouts += 1;
+          traceHandler.getTraceInstance()?.onPoolRequestTimeout(this);
           reject(errors.getErr(errors.ERR_CONN_REQUEST_TIMEOUT,
             this._queueTimeout));
         }, this._queueTimeout);
@@ -466,6 +470,8 @@ class Pool extends EventEmitter {
     if (request.error)
       throw request.error;
 
+    traceHandler.getTraceInstance()?.onPoolAcquire(this);
+
     return request.conn;
   }
 
@@ -858,6 +864,15 @@ class Pool extends EventEmitter {
   get connectTraceConfig() {
     return this._impl && this._impl._getConnectTraceConfig();
   }
+
+  //---------------------------------------------------------------------------
+  // Symbol.asyncDispose
+  //
+  // Implement explicit resource management.
+  //---------------------------------------------------------------------------
+  async [Symbol.asyncDispose]() {
+    await this.close();
+  }
 }
 
 nodbUtil.wrapFns(Pool.prototype, false,

package/lib/resultset.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+// Copyright (c) 2016, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -59,7 +59,7 @@ class ResultSet {
 
       // fetch all rows
       let rowsFetched = [];
-      while (true) {    // eslint-disable-line
+      while (true) {
         if (maxRows > 0 && fetchArraySize >= maxRows) {
           fetchArraySize = maxRows;
         }
@@ -206,12 +206,7 @@ class ResultSet {
     this._impl = resultSetImpl;
   }
 
-  //---------------------------------------------------------------------------
-  // close()
-  //
-  // Close the result set and make it unusable for further operations.
-  //---------------------------------------------------------------------------
-  async close() {
+  async _close() {
     errors.assertArgCount(arguments, 0, 0);
     errors.assert(this._impl && this._connection._impl, errors.ERR_INVALID_RS);
 
@@ -226,13 +221,15 @@ class ResultSet {
   }
 
   //---------------------------------------------------------------------------
-  // getRow()
+  // close()
   //
-  // Returns a single row to the caller from the result set, if one is
-  // available. Rows are buffered in a JavaScript array in order to avoid trips
-  // through the thread pool that would be required if implemented in C.
+  // Close the result set and make it unusable for further operations.
   //---------------------------------------------------------------------------
-  async getRow() {
+  async close() {
+    await this._close.apply(this, arguments);
+  }
+
+  async _getRow() {
     errors.assertArgCount(arguments, 0, 0);
     errors.assert(this._impl && this._connection._impl, errors.ERR_INVALID_RS);
 
@@ -252,15 +249,17 @@ class ResultSet {
   }
 
   //---------------------------------------------------------------------------
-  // getRows()
+  // getRow()
   //
-  // Check to see if any rows are in the JS buffer (which could result from
-  // interspersed calls to getRow() and getRows()). If no rows are in the
-  // buffer, the call is just proxied to the implementation layer. Otherwise,
-  // rows are pulled from the buffer and potentially concatenated with rows
-  // from calls to the implementation's getRows().
+  // Returns a single row to the caller from the result set, if one is
+  // available. Rows are buffered in a JavaScript array in order to avoid trips
+  // through the thread pool that would be required if implemented in C.
   //---------------------------------------------------------------------------
-  async getRows(numRows) {
+  async getRow() {
+    return await this._getRow.apply(this, arguments);
+  }
+
+  async _doGetRows(numRows) {
     let rowsNeeded;
 
     errors.assertArgCount(arguments, 0, 1);
@@ -282,7 +281,7 @@ class ResultSet {
     if (numRows == 0) {
       requestedRows = this._rowCache;
       const fetchArraySize = this._impl.fetchArraySize;
-      while (true) {  // eslint-disable-line
+      while (true) {
         const rows = await this._getRows(fetchArraySize);
         if (rows) {
           await this._processRows(rows, false);
@@ -312,6 +311,19 @@ class ResultSet {
     return requestedRows;
   }
 
+  //---------------------------------------------------------------------------
+  // getRows()
+  //
+  // Check to see if any rows are in the JS buffer (which could result from
+  // interspersed calls to getRow() and getRows()). If no rows are in the
+  // buffer, the call is just proxied to the implementation layer. Otherwise,
+  // rows are pulled from the buffer and potentially concatenated with rows
+  // from calls to the implementation's getRows().
+  //---------------------------------------------------------------------------
+  async getRows() {
+    return await this._doGetRows.apply(this, arguments);
+  }
+
   //---------------------------------------------------------------------------
   // metaData()
   //
@@ -358,6 +370,15 @@ class ResultSet {
     };
   }
 
+  //---------------------------------------------------------------------------
+  // Symbol.asyncDispose
+  //
+  // Implement explicit resource management.
+  //---------------------------------------------------------------------------
+  async [Symbol.asyncDispose]() {
+    await this.close();
+  }
+
 }
 
 nodbUtil.wrapFns(ResultSet.prototype, errors.ERR_BUSY_RS,

package/lib/settings.js

@@ -62,6 +62,7 @@ class Settings {
     this.configProviderCacheTimeout = 86400;
     this.thin = true;
     this.thinDriverInitialized = false;
+    this.thickModeDSNPassthrough = true;
     this.createFetchTypeMap(this.fetchAsString, this.fetchAsBuffer);
     this.fetchTypeHandler = undefined;
     this.dbObjectTypeHandler = undefined;