feat(sap): add support for maxWaitTimeoutIfPoolExhausted

Author: alumni

docker-compose.yml

@@ -116,14 +116,14 @@ services:
   # sap hana
   # works only on linux, minimum 10GB RAM for docker required
   hanaexpress:
-    image: "saplabs/hanaexpress:2.00.076.00.20240701.1"
+    image: "saplabs/hanaexpress:2.00.088.00.20251110.1"
     container_name: "typeorm-hanaexpress"
     hostname: hxe
     command:
       [
+        "--agree-to-sap-license",
         "--passwords-url",
         "file:////hana/hxe-config.json",
-        "--agree-to-sap-license",
       ]
     ulimits:
       nofile: 1048576

docs/docs/drivers/sap.md

@@ -25,6 +25,7 @@ See [Data Source Options](../data-source/2-data-source-options.md) for the commo
 -   `pool` — Connection pool configuration object:
     -   `maxConnectedOrPooled` (number) — Max active or idle connections in the pool (default: 10).
     -   `maxPooledIdleTime` (seconds) — Time before an idle connection is closed (default: 30).
+    -   `maxWaitTimeoutIfPoolExhausted` (milliseconds) - Time to wait for a connection to become available (default: 0, no wait). Requires `@sap/hana-client` version `2.27` or later.
     -   `pingCheck` (boolean) — Whether to validate connections before use (default: false).
     -   `poolCapacity` (number) — Maximum number of connections to be kept available (default: no limit).
 

package-lock.json

@@ -114,7 +114,7 @@
   "devDependencies": {
     "@eslint/js": "^9.39.1",
     "@google-cloud/spanner": "^8.3.1",
-    "@sap/hana-client": "^2.26.26",
+    "@sap/hana-client": "^2.27.19",
     "@tsconfig/node16": "^16.1.8",
     "@types/chai": "^4.3.20",
     "@types/chai-as-promised": "^7.1.8",

package.json

@@ -45,6 +45,14 @@ export interface SapConnectionOptions
          */
         readonly maxPooledIdleTime?: number
 
+        /**
+         * Defines the maximum time, in milliseconds, to wait for a connection
+         * to become available once the specified number of `maxConnectedOrPooled`
+         * open connections have been reached (default: 0, no wait).
+         * @remarks Requires `@sap/hana-client` version `2.27` or later.
+         */
+        readonly maxWaitTimeoutIfPoolExhausted?: number
+
         /**
          * Determines whether or not the pooled connection should be tested for
          * viability before being reused (default: false).
@@ -77,7 +85,7 @@ export interface SapConnectionOptions
 
         /**
          * Max milliseconds a request will wait for a resource before timing out.
-         * @deprecated Obsolete, no alternative exists.
+         * @deprecated Use {@link maxWaitTimeoutIfPoolExhausted} instead.
          */
         readonly requestTimeout?: number
 

src/driver/sap/SapConnectionOptions.ts

@@ -291,6 +291,9 @@ export class SapDriver implements Driver {
                 (this.options.pool?.idleTimeout
                     ? this.options.pool.idleTimeout / 1000
                     : 30),
+            maxWaitTimeoutIfPoolExhausted:
+                this.options.pool?.maxWaitTimeoutIfPoolExhausted ??
+                this.options.pool?.requestTimeout,
         }
         if (this.options.pool?.pingCheck) {
             poolOptions.pingCheck = this.options.pool.pingCheck