From cbaf12be5afa45df3366facbd03d75df3bf3f6d7 Mon Sep 17 00:00:00 2001
From: sjvans <30337871+sjvans@users.noreply.github.com>
Date: Wed, 18 Mar 2026 16:16:42 +0100
Subject: [PATCH 1/3] [cds^10] make builtin pool the default

---
 db-service/package.json | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/db-service/package.json b/db-service/package.json
index c8cdebf51..e94bb3676 100644
--- a/db-service/package.json
+++ b/db-service/package.json
@@ -23,11 +23,14 @@
   "scripts": {
     "test": "cds-test"
   },
-  "dependencies": {
-    "generic-pool": "^3.9.0"
-  },
   "peerDependencies": {
-    "@sap/cds": ">=9.8"
+    "@sap/cds": ">=9.8",
+    "generic-pool": "^3.9.0"
   },
+  "peerDependenciesMeta": {
+    "generic-pool": {
+      "optional": true
+    }
+  }
   "license": "Apache-2.0"
 }

From a33ad361f0dfb442069120f1df2738b9db77a2d8 Mon Sep 17 00:00:00 2001
From: sjvans <30337871+sjvans@users.noreply.github.com>
Date: Wed, 18 Mar 2026 16:23:54 +0100
Subject: [PATCH 2/3] Change pool selection logic in generic-pool.js

---
 db-service/lib/common/generic-pool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db-service/lib/common/generic-pool.js b/db-service/lib/common/generic-pool.js
index 66b9cef1f..e25376da0 100644
--- a/db-service/lib/common/generic-pool.js
+++ b/db-service/lib/common/generic-pool.js
@@ -1,7 +1,7 @@
 const cds = require('@sap/cds')
 const LOG = cds.log('db')
 
-const use_new_pool = cds.requires.db?.pool?.builtin || cds.env.features.pool === 'builtin'
+const use_new_pool = cds.requires.db?.pool?.builtin === false || cds.env.features.pool === 'generic-pool' ? false : true
 const createPool = use_new_pool ? (...args) => new Pool(...args) : require('generic-pool').createPool
 
 function ConnectionPool (factory, tenant) {

From d89584f1855da5ee0f5e2430e2e6acdc250518e7 Mon Sep 17 00:00:00 2001
From: D045778 <johannes.vogel@sap.com>
Date: Tue, 12 May 2026 10:08:57 +0200
Subject: [PATCH 3/3] fix format

---
 db-service/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db-service/package.json b/db-service/package.json
index 831bacda5..41c3cd347 100644
--- a/db-service/package.json
+++ b/db-service/package.json
@@ -31,6 +31,6 @@
     "generic-pool": {
       "optional": true
     }
-  }
+  },
   "license": "Apache-2.0"
 }