@sap/cds-dk 10.1.0 → 10.1.2

package/bin/import.js

@@ -1,9 +1,12 @@
+const { FILE, DIR } = require('./completion')
 module.exports = Object.assign(_import, {
     _name: 'import',
     staticCompletions: () => ({
         '--from': ['asyncapi', 'edmx', 'openapi'],
         '--as':   ['cds', 'csn', 'json'],
-        '_':      { type: ':file', ext: ['json', 'xml', 'edmx'] },
+        '--out':  DIR(),
+        '-o':     DIR(),
+        '_':      FILE('json,xml,edmx'),
     }),
     options:   [ '--services', '--for', '--out', '--as', '--name', '--include-namespaces', '--dependencies', '--from', '--config', '--destination', '--group', '--into-namespace' ],
     shortcuts: [ '-s',            '-4',    '-o',  '-as',     '-n',                  '-ns',             '-d',undefined,       '-c',       undefined, undefined,                '-2',        '-', '-f', '-b'],

package/bin/init.js

@@ -10,6 +10,7 @@ module.exports = Object.assign(init, {
     staticCompletions: () => ({
         '--add':          COMMA(require('../bin/completion/completionFs').readTemplates([])),
         '--java:package': DIR(),
+        '--base':         DIR(),
     }),
     options: ['--add', '--java:mvn', '--java:package', '--lint:custom', '--lint:custom:example', '--no-db', '--base'],
     shortcuts: ['-a'],

package/bin/inspect.js

@@ -9,7 +9,9 @@ const { FILE } = require('./completion');
 module.exports = Object.assign (inspect, {
     staticCompletions: () => ({
         '--kind': ['entity', 'aspect', 'type', 'service'],
-        '_':      FILE('cds,json'),
+        '--list': ['names', 'elements', 'keys', 'associations', 'compositions', 'ids', 'sources', 'all'],
+        '-l':     ['names', 'elements', 'keys', 'associations', 'compositions', 'ids', 'sources', 'all'],
+        '_':      FILE('cds,json', { dirs: true }),
     }),
     options: [ '--stats', '--list', '--kind' ],
   shortcuts: [ '-s', '-l', '-k' ],

package/bin/lint.js

@@ -1,13 +1,15 @@
+const { FILE } = require('./completion')
 const Linter = require('../lib/lint/Linter');
 const linter = new Linter();
 
-// cds cli exec expects an executable object with various additional properties.
-// As most of the linting functionality is bound to a class instance, we need to wrap the instance
-// to not lose the this-context and attach the additional properties to the function.
 const lint = (...args) => linter.lint(...args)
 const additionalProperties = Object.entries(linter.init())
     .map(([key, value]) => [key, { value }])
 
 Object.defineProperties(lint, Object.fromEntries(additionalProperties))
 
+lint.staticCompletions = () => ({
+    '_': FILE('js,ts,cds', { dirs: true }),
+})
+
 module.exports = lint

package/bin/minify.js

@@ -119,4 +119,9 @@ class Dryifier extends Minifier {
   }
 }
 
-module.exports = Object.assign (Minify._for_cds_dk(), { Minify })
+const { FILE } = require('./completion')
+module.exports = Object.assign (Minify._for_cds_dk(), { Minify,
+  staticCompletions: () => ({
+    '_': FILE('cds,json', { dirs: true }),
+  })
+})

package/bin/repl.js

@@ -1,6 +1,15 @@
+const { DIR } = require('./completion');
 module.exports = Object.assign (repl, {
-  options: [ '--run', '--use', '--ql' ],
-  shortcuts: [ '-r', '-u' ],
+  options: [ '--run', '--use' ],
+  flags: [ '--ql' ],
+  shortcuts: ['-r', '-u'],
+  staticCompletions: () => ({
+    '_':     DIR(),
+    '--run': DIR(),
+    '-r':    DIR(),
+    '--use': ['xl', 'ql', 'entities', 'services'],
+    '-u':    ['xl', 'ql', 'entities', 'services'],
+  }),
   help: `
 # SYNOPSIS
 

package/bin/run.js

@@ -1,6 +1,17 @@
+const { DIR } = require('./completion');
 const serve = require ('./serve')
 module.exports = Object.assign (
-    cds_run, serve, {help: `
+    cds_run, serve, {
+    staticCompletions: () => ({
+        '_':       DIR(),
+        '--from':  DIR(),
+        '-f':      DIR(),
+        '--with':  DIR(),
+        '-w':      DIR(),
+        '--to':    ['odata', 'fiori', 'rest'],
+        '-2':      ['odata', 'fiori', 'rest'],
+    }),
+    help: `
 # SYNOPSIS
 
     *cds run* [<project>] [<options>]

package/bin/serve.js

@@ -1,6 +1,17 @@
 // allows executing `cds serve` even when `cds` executable is removed from `@sap/cds`
-
-module.exports = require(_local('@sap/cds/bin/serve'))
+const { DIR } = require('./completion');
+const serve = require(_local('@sap/cds/bin/serve'))
+module.exports = Object.assign(serve, {
+  staticCompletions: () => ({
+    '_':      DIR(),
+    '--from': DIR(),
+    '-f':     DIR(),
+    '--with': DIR(),
+    '-w':     DIR(),
+    '--to':   ['odata', 'fiori', 'rest'],
+    '-2':     ['odata', 'fiori', 'rest'],
+  }),
+})
 
 function _local (id) {
   return require.resolve (id, { paths: [ process.cwd(), __dirname ] })

package/bin/up.js

@@ -1,6 +1,9 @@
+const { FILE } = require('./completion');
+
 module.exports = Object.assign(up, {
   staticCompletions: () => ({
-      '--to': ['cf', 'k8s'],
+      '--to':      ['cf', 'k8s'],
+      '--overlay': FILE('mtaext')
   }),
   options: ['--to', '--namespace', '--overlay'],
   shortcuts: ['-2', '-n'],

package/bin/util/containerize.js

@@ -59,6 +59,7 @@ function processCommands(bp) {
 }
 function processBuildpack(bp, name, tag, clearCache = false, image, publish = false) {
   let { type, path, env, builder } = bp.buildpack
+  const dependencyMirrors = Object.keys(process.env).filter(key => key.startsWith('BP_DEPENDENCY_MIRROR_') && process.env[key])
   type = type ? type.split(',').map(t => buildpacks.has(t.trim()) ? `paketo-buildpacks/${t.trim()}` : t.trim()) : []
   if (builders.has(builder)) builder = `paketobuildpacks/${builder}`
   const cacheArgs = clearCache ? ['--clear-cache'] : []
@@ -69,6 +70,7 @@ function processBuildpack(bp, name, tag, clearCache = false, image, publish = fa
     ...type.flatMap(t => appendSubcommand(t, '--buildpack')),
     ...appendSubcommand(builder, '--builder'),
     ...appendSubcommand(env, '--env'),
+    ...dependencyMirrors.flatMap(key => ['--env', key]),
     ...(publish ? ['--publish'] : []),
     ...cacheArgs
   ]]

package/bin/watch/index.js

@@ -3,10 +3,17 @@ const { DIR } = require('../completion')
 
 module.exports = Object.assign ( watch, {
   staticCompletions: () => ({
+    '_':                         DIR(),
+    '--from':                    DIR(),
+    '-f':                        DIR(),
+    '--with':                    DIR(),
+    '-w':                        DIR(),
+    '--to':                      ['odata', 'fiori', 'rest'],
+    '-2':                        ['odata', 'fiori', 'rest'],
     '--experimental-hot-reload': ['true', 'false'],
     '--livereload':              ['false'],
     '--include':                 DIR(),
-    '--exclude':                 DIR(),
+    '--exclude':                 DIR()
   }),
   flags: [ '--in-memory', '--in-memory?', '--with-mocks', '--with-mtx' ],
   options: [ '--port', ...watchOnlyOptions ],

package/lib/build/plugins/internal.js

@@ -132,36 +132,10 @@ module.exports = class InternalBuildPlugin extends require('./plugin') {
         // bundleDest might be null
         if (bundleDest && Object.keys(bundles).length > 0) {
             await this.write(bundles).to(file)
-            // also collect and write messages from plugins
-            await this.collectMessageBundles(bundleDest, model)
             return { file, bundles }
         }
         return null
     }
-
-    /**
-     * Collect and write message bundles from CAP plugins into messages.properties files.
-     * @param {string} bundleDest
-     * @param {Object} model - passed for signature consistency with subclass overrides; not used here
-     * as Java does not require neighborhood resolution of plugin i18n files.
-     */
-    // eslint-disable-next-line no-unused-vars
-    async collectMessageBundles(bundleDest, model) {
-        const messageBundle = cds.i18n.bundle4('messages')
-        const messagesData = messageBundle.translations4?.(cds.env.i18n.languages) ?? {}
-
-        // Write messages.properties files for each locale
-        for (const [locale, messages] of Object.entries(messagesData)) {
-            if (Object.keys(messages).length > 0) {
-                const fileName = locale ? `messages_${locale}.properties` : 'messages.properties'
-                const filePath = path.join(bundleDest, fileName)
-                const content = Object.entries(messages)
-                    .map(([key, value]) => `${key}=${value}`)
-                    .join('\n') + '\n'
-                await this.write(content).to(filePath)
-            }
-        }
-    }
 }
 
 // Emits the 'compile.for.runtime' event, as the produced CSN is for runtime usage.

package/lib/build/plugins/nodejs/index.js

@@ -10,6 +10,7 @@ const DEBUG = cds.debug('cli|build')
 const NODE_ENGINE_VERSION = '^24'
 const { exec } = require('node:child_process')
 const pexec = require('node:util').promisify(exec)
+const escapeLineBreaks = value => value.replace(/\r/g, '\\u000D').replace(/\n/g, '\\u000A')
 
 module.exports = class NodejsBuildPlugin extends require('../edmx') {
 
@@ -353,15 +354,19 @@ module.exports = class NodejsBuildPlugin extends require('../edmx') {
         return Array.isArray(parsed) ? parsed : Object.values(parsed)
     }
 
-    // Override to pass model for neighborhood resolution of plugin i18n files.
-    // Cannot be done in InternalBuildPlugin because Java relies on the model-less behaviour.
+    async collectLanguageBundles(model, bundleDest) {
+        const result = await super.collectLanguageBundles(model, bundleDest)
+        if (result) await this.collectMessageBundles(bundleDest, model)
+        return result
+    }
+
     async collectMessageBundles(bundleDest, model) {
         const messageBundle = cds.i18n.bundle4('messages', { model })
         const messagesData = messageBundle.translations4?.(cds.env.i18n.languages) ?? {}
         for (const [locale, messages] of Object.entries(messagesData)) {
             if (Object.keys(messages).length > 0) {
                 const fileName = locale ? `messages_${locale}.properties` : 'messages.properties'
-                const content = Object.entries(messages).map(([k, v]) => `${k}=${v}`).join('\n') + '\n'
+                const content = Object.entries(messages).map(([k, v]) => `${k}=${escapeLineBreaks(v)}`).join('\n') + '\n'
                 await this.write(content).to(path.join(bundleDest, fileName))
             }
         }

package/lib/build/util.js

@@ -8,7 +8,6 @@ const { exists } = cds.utils
 const execAsync = require('node:util').promisify(cp.exec)
 const { isRoot } = require('../util/fs')
 
-const IS_WIN = require('node:os').platform() === 'win32'
 const { SEVERITY_ERROR, FILE_EXT_CDS, NODEJS_MODEL_EXCLUDE_LIST } = require('./constants');
 const DEBUG = cds.debug('cli|build')
 
@@ -288,7 +287,7 @@ const _cachedWsRoots = new Map()
  * could contain globs. Glob resolution will be supported.
  * The result is cached by workspace root!
  * natively in the future (fs.glob is in experimental state as of Node23).
- * @param {import('fs').PathLike} wsRoot - the root directory of the workspace
+ * @param {string} wsRoot - the root directory of the workspace
  * @returns {Promise<string[]>} list of package paths, or an empty array if either
  * no workspaces are defined or have not been installed.
  */
@@ -302,8 +301,7 @@ async function _execNpmWs(wsRoot) {
     try {
         const cmdLine = 'npm ls --ws --json'
         DEBUG?.(`execute ${cmdLine}`)
-        // @ts-expect-error - TODO: shell should be a string. But can probably be removed altogether?
-        const { stdout } = await execAsync(cmdLine, { shell: IS_WIN, stdio: ['inherit', 'pipe', 'inherit'], cwd: wsRoot })
+        const { stdout } = await execAsync(cmdLine, { cwd: wsRoot })
         const jsonResult = JSON.parse(stdout)
         if (jsonResult.dependencies) {
             result = Object.keys(jsonResult.dependencies)

package/lib/cds.js

@@ -11,10 +11,16 @@ module.exports = Object.defineProperties (cds, {
 
 function _local (id, ...morePaths) {
   return require(require.resolve (id, {paths:[
-    process.cwd(), // project-local module is preferred
+    _cwd(),         // project-local module is preferred
     __dirname,      // otherwise from our own dependencies
     ...morePaths
-  ]}))
+  ].filter(Boolean)})) // drop empty paths (e.g. _cwd()/_npmRoot() fallbacks); require.resolve expects real paths
+}
+
+function _cwd() {
+  // process.cwd() throws ENOENT (uv_cwd) when the cwd was deleted
+  try { return process.cwd() }
+  catch (e) { if (e.code === 'ENOENT') return '' }
 }
 
 function _npmRoot() {

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [25],
-    MAVEN_ARCHETYPE_VERSION: '5.0.1',
+    MAVEN_ARCHETYPE_VERSION: '5.1.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',

package/lib/init/merge.js

@@ -165,8 +165,28 @@ async function _mergeYAML(into, from, project, semantics = {}) {
             t.value = s.value
         }
     }
+    const deleteEntries = entries => {
+        for (const { item, key, relationships: refs } of entries) {
+            const seq = locate(target, item.in)
+            const node = locate(target, item)
+            if (!YAML.isSeq(seq) || !node) continue
+            const removed = node.toJSON()
+            key ? node.deleteIn(path(key)) : seq.delete(seq.items.indexOf(node))
+            for (const { removeProperty, allWithin } of refs ?? []) {
+                const [parentPath, childPath, prop] = allWithin
+                for (const parent of locate(target, parentPath)?.items ?? []) {
+                    const list = parent.getIn(path(childPath))
+                    const i = list?.items?.findIndex(n => n.get?.(prop) === removed[removeProperty]) ?? -1
+                    if (i > -1) list.delete(i)
+                }
+            }
+        }
+    }
     mergeNode(target.contents, source.contents)
 
+    // Deletions: remove the matched node (or a sub-key), then cascade-remove references to it.
+    deleteEntries(deletions.filter(({ key }) => !key))
+
     // Placement: add matched (and relationship-referenced) template entries not already present.
     const isEntry = e => e && typeof e === 'object' && !Array.isArray(e) && e.in !== undefined
     const insertNode = ins => Array.isArray(ins) ? (ins.length === 1 ? ins[0] : undefined) : ins
@@ -208,22 +228,7 @@ async function _mergeYAML(into, from, project, semantics = {}) {
         }
     }
 
-    // Deletions: remove the matched node (or a sub-key), then cascade-remove references to it.
-    for (const { item, key, relationships: refs } of deletions) {
-        const seq = locate(target, item.in)
-        const node = locate(target, item)
-        if (!YAML.isSeq(seq) || !node) continue
-        const removed = node.toJSON()
-        key ? node.deleteIn(path(key)) : seq.delete(seq.items.indexOf(node))
-        for (const { removeProperty, allWithin } of refs ?? []) {
-            const [parentPath, childPath, prop] = allWithin
-            for (const parent of locate(target, parentPath)?.items ?? []) {
-                const list = parent.getIn(path(childPath))
-                const i = list?.items?.findIndex(n => n.get?.(prop) === removed[removeProperty]) ?? -1
-                if (i > -1) list.delete(i)
-            }
-        }
-    }
+    deleteEntries(deletions.filter(({ key }) => key))
 
     typeof into === 'string' && await writeYAML(into, target)
     return target
@@ -349,4 +354,3 @@ module.exports.merge = (...src) => {
  * @property {Deletion[]} [deletions] - matched nodes (or sub-keys) to delete
  * @property {Relationship[]} [relationships] - relationships to wire into target sequences
  */
-

package/lib/init/template/cloud-logging/index.js

@@ -40,7 +40,7 @@ module.exports = class extends require('../../plugin') {
 
   async combine(facet) {
     const project = readProject(facet)
-    const { hasMta, addMta, addKyma, addApprouter, isJava, addMultitenancy, srv } = project
+    const { hasMta, addMta, addKyma, addApprouter, hasApprouter, isJava, addMultitenancy, hasMultitenancy, srv } = project
 
     if (addMta || (addMultitenancy || addApprouter) && hasMta) {
       const cloudLogging = {
@@ -58,14 +58,14 @@ module.exports = class extends require('../../plugin') {
           into: [srvModule, 'requires', 'name']
         })
       }
-      if (addMultitenancy) {
+      if (hasMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [mtxSidecar, 'requires', 'name']
         })
       }
-      if (addApprouter) {
+      if (hasApprouter) {
         relationships.push({
           insert: [cloudLogging, 'name'],
           into: [approuter, 'requires', 'name']

package/lib/init/template/data/as-json.js

@@ -247,6 +247,9 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
       const range = { from: 0, to: prec }
       annotatedIntRange(element, range)
       if (scale === 0) return randomIntInRange(range)
+      const factor = Math.pow(10, scale)
+      range.from = Math.ceil(range.from * factor) / factor
+      range.to = Math.floor(range.to * factor) / factor
       // draw uniformly across the range and round to scale, so annotated bounds are never exceeded
       const val = +randomDecimalInRange(range).toFixed(scale)
       return +Math.min(Math.max(val, range.from), range.to).toFixed(scale)

package/lib/init/template/destination/index.js

@@ -25,7 +25,7 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
 
     async combine(facet) {
         const project = readProject(facet)
-        const { addApprouter, addMultitenancy, addKyma, addMta, hasMta, srv, isJava } = project
+        const { addApprouter, hasApprouter, addMultitenancy, hasMultitenancy, addKyma, addMta, hasMta, srv, isJava } = project
 
         if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srvModule = srv4(srv.path)
@@ -34,13 +34,13 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
                 insert: [destination, 'name'],
                 into: [srvModule, 'requires', 'name']
             }]
-            if (addApprouter) {
+            if (hasApprouter) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [approuter, 'requires', 'name']
                 })
             }
-            if (addMultitenancy) {
+            if (hasMultitenancy) {
                 relationships.push({
                     insert: [destination, 'name'],
                     into: [mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar'), 'requires', 'name']

package/lib/init/template/enterprise-messaging/index.js

@@ -6,6 +6,9 @@ const { srv4, enterpriseMessaging, xsuaa } = require('../../registries/mta')
 const KymaTemplate = require('../kyma')
 
 module.exports = class EnterpriseMessagingTemplate extends require('../../plugin') {
+  static get kind() { return 'enterprise-messaging-http' }
+  static get vcap() { return 'enterprise-messaging' }
+
   constructor(...args) {
     super(...args)
     this._name = 'enterprise-messaging'
@@ -37,7 +40,7 @@ module.exports = class EnterpriseMessagingTemplate extends require('../../plugin
 
   static hasInProduction(env) {
     const { kind = 'dummy', vcap } = env.requires?.messaging ?? {}
-    return kind === this._kind && vcap?.label === this._vcap
+    return kind === this.kind && vcap?.label === this.vcap
   }
 
   async run() {

package/lib/init/template/event-mesh/index.js

@@ -1,6 +1,9 @@
 const { eventMesh } = require('../../registries/mta')
 
 module.exports = class EventMeshTemplate extends require('../enterprise-messaging') {
+  static get kind() { return 'enterprise-messaging-http' }
+  static get vcap() { return 'event-mesh-message-client' }
+
   constructor(...args) {
     super(...args)
     this._name = 'event-mesh'

package/lib/init/template/multitenancy/index.js

@@ -44,11 +44,11 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
     const project = readProject(facet)
     const {
       isNodejs, isJava, addMta, hasMta,
-      addXsuaa, hasXsuaa, addIas, hasIas, hasHana, hasHanaServerless, addKyma, hasApprouter,
+      addXsuaa, hasXsuaa, addIas, hasIas, addMultitenancy, hasHana, hasHanaServerless, addKyma, hasApprouter,
       srv, appName
     } = project
 
-    if (addMta || (addIas || addXsuaa) && hasMta) {
+    if (addMta || (addMultitenancy || addIas || addXsuaa) && hasMta) {
       const srvModule = srv4(srv.path)
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srvModule, mtxSidecar]

package/lib/init/template/workzone-standard/index.js

@@ -93,7 +93,7 @@ module.exports = class extends require('../../plugin') {
       }
       if (addXsuaa) {
         relationships.push({
-          insert: [xsuaa],
+          insert: [xsuaa, 'name'],
           into: [destinations, 'requires']
         })
         additions.push({

package/node_modules/@cap-js/db-service/CHANGELOG.md

@@ -4,6 +4,36 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.1.1](https://github.com/cap-js/cds-dbs/compare/db-service-v3.1.0...db-service-v3.1.1) (2026-09-15)
+
+
+### Fixed
+
+* **cqn4sql:** correctly expand `not exists <assoc>` alongside a null-check branch ([#1736](https://github.com/cap-js/cds-dbs/issues/1736)) ([bfb0a01](https://github.com/cap-js/cds-dbs/commit/bfb0a010cce2cea089f4fabf92a3ecea43486a09))
+
+
+### Performance Improvements
+
+* do not use ranked search for static values ([#1727](https://github.com/cap-js/cds-dbs/issues/1727)) ([33fb36b](https://github.com/cap-js/cds-dbs/commit/33fb36bbf0f86291e5fc0b9e2ff5b7244b49d19e))
+* if explicit order by is specified, do not add ranked search as a secondary clause ([33fb36b](https://github.com/cap-js/cds-dbs/commit/33fb36bbf0f86291e5fc0b9e2ff5b7244b49d19e))
+
+## [3.1.0](https://github.com/cap-js/cds-dbs/compare/db-service-v3.0.1...db-service-v3.1.0) (2026-09-07)
+
+
+### Added
+
+* rank $search results by relevance ([#1725](https://github.com/cap-js/cds-dbs/issues/1725)) ([bc93160](https://github.com/cap-js/cds-dbs/commit/bc931601a721f7c9e00b89e6844ba064352b541d))
+
+
+### Fixed
+
+* **cqn4sql:** reject overly nested query expressions instead of crashing ([#1712](https://github.com/cap-js/cds-dbs/issues/1712)) ([29a45b7](https://github.com/cap-js/cds-dbs/commit/29a45b7daadbc77433b882148700d73c00efae62))
+* don't throw when releasing/destroying a resource that's no longer in the pool ([#1696](https://github.com/cap-js/cds-dbs/issues/1696)) ([5d3b277](https://github.com/cap-js/cds-dbs/commit/5d3b277a1cf7cac02e41f2f24975a8e9473e5b5e))
+* exclude cds.Vector from wildcard select expansion ([#1716](https://github.com/cap-js/cds-dbs/issues/1716)) ([398bacc](https://github.com/cap-js/cds-dbs/commit/398bacc2a74883dcd93acba288deae362570a4c1))
+* INSERT.from(SELECT) used non-existent `value`  ([#1565](https://github.com/cap-js/cds-dbs/issues/1565)) ([fd98844](https://github.com/cap-js/cds-dbs/commit/fd98844c83a78d6cf2b0b71344d3ee1d88528106))
+* **pool:** recover lost connection after stale acquire timeout ([#1724](https://github.com/cap-js/cds-dbs/issues/1724)) ([cf6af99](https://github.com/cap-js/cds-dbs/commit/cf6af991d02be7cf5f861e2a424d4d733b8f9238))
+* pql groupby path expression ([#1700](https://github.com/cap-js/cds-dbs/issues/1700)) ([82b5e03](https://github.com/cap-js/cds-dbs/commit/82b5e0385e680321f30c352f0f78ade6d25259a6))
+
 ## [3.0.1](https://github.com/cap-js/cds-dbs/compare/db-service-v3.0.0...db-service-v3.0.1) (2026-06-29)
 
 

package/node_modules/@cap-js/db-service/lib/common/generic-pool.js

@@ -150,7 +150,7 @@ constructor (factory, options = {}) {
       return
     }
     const loan = this._loans.get(resource)
-    if (!loan) throw new Error('Resource not currently part of this pool')
+    if (!loan) return
     this._loans.delete(resource)
     const pooledResource = loan.pooledResource
     pooledResource.idle()
@@ -164,7 +164,7 @@ constructor (factory, options = {}) {
       return
     }
     const loan = this._loans.get(resource)
-    if (!loan) throw new Error('Resource not currently part of this pool')
+    if (!loan) return
     this._loans.delete(resource)
     const pooledResource = loan.pooledResource
     await this.#destroy(pooledResource)
@@ -212,16 +212,13 @@ constructor (factory, options = {}) {
       for (let i = 0; i < needed; i++) this.#createResource()
     }
     const dispense = async resource => {
-      const request = this._queue.shift()
+      let request = this._queue.shift()
+      while (request && request.state !== RequestState.PENDING) request = this._queue.shift()
       if (!request) {
         resource.idle()
         this._available.add(resource)
         return false
       }
-      if (request.state !== RequestState.PENDING) {
-        this.#dispense()
-        return false
-      }
       this._loans.set(resource.obj, { pooledResource: resource })
       resource.update(ResourceState.ALLOCATED)
       request.resolve(resource.obj)

package/node_modules/@cap-js/db-service/lib/cqn2pql.js

@@ -18,7 +18,7 @@ class CQN2PQLRenderer extends CQN2SQL {
 
   column_expr(x, q) {
     // omit alias when target is a single source
-    if (q.SELECT.from.ref && x?.ref) x.ref = x.ref.slice(-1)
+    if (q.SELECT.from?.ref && x?.ref) x.ref = x.ref.slice(-1)
     return super.column_expr(x, q)
   }
 

package/node_modules/@cap-js/db-service/lib/cqn2sql.js

@@ -1088,7 +1088,7 @@ class CQN2SQLRenderer {
 
     const extractions = this._managed = this.managed(columns.map(c => ({ name: c, sql: `NEW.${this.quote(c)}` })), elements)
     const sql = extractions.length > columns.length
-      ? `SELECT ${extractions.map(c => `${c.insert} AS ${this.quote(c.name)}`)} FROM (${this.SELECT(src)}) AS NEW`
+      ? `SELECT ${extractions.map((c, i) => `${i < columns.length ? c.insert : c.onInsert} AS ${this.quote(c.name)}`)} FROM (${this.SELECT(src)}) AS NEW`
       : this.SELECT(src)
     if (extractions.length > columns.length) columns = this.columns = extractions.map(c => c.name)
     this.sql = `INSERT INTO ${this.quote(entity)}${alias ? ' as ' + this.quote(alias) : ''} (${columns.map(c => this.quote(transitions.mapping.get(c)?.ref?.[0] || c))}) ${sql}`
@@ -1161,12 +1161,12 @@ class CQN2SQLRenderer {
       const extractions = this._managed
       if (this.values) this.values = [] // Clear previously computed values
       const src = this.cqn4sql(UPSERT.from || UPSERT.as)
-      const aliasedQuery = cds.ql.SELECT
-        .columns(src.SELECT.columns
-          .map((c, i) => ({ ref: [this.column_name(c)], as: this.columns[i] }))
-        )
-        .from(src)
-      sql = `SELECT ${extractions.map(c => `${c.upsert}`)} FROM (${this.SELECT(aliasedQuery)}) AS NEW LEFT JOIN ${this.quote(entity)} AS OLD ON ${keyCompare}`
+      const aliasedQuery = `SELECT ${[
+        ...src.SELECT.columns.map((c, i) => this.column_expr({ ref: [this.column_name(c)], as: this.columns[i] })),
+        ...extractions.slice(src.SELECT.columns.length).map(c => `${elements[c.name].key ? c.onInsert : 'NULL'} AS ${this.quote(c.name)}`), // fill in missing default values
+      ]} FROM (${this.SELECT(src)})`
+
+      sql = `SELECT ${extractions.map(c => elements[c.name].key ? `NEW.${this.quote(c.name)}` : c.upsert)} FROM(${aliasedQuery}) AS NEW LEFT JOIN ${this.quote(entity)} AS OLD ON ${keyCompare} `
       if (extractions.length > columns.length) columns = this.columns = extractions.map(c => c.name)
       this.entries = [this.values]
     }
@@ -1574,9 +1574,11 @@ class CQN2SQLRenderer {
 
   managed_extract(name, element, converter) {
     const { UPSERT, INSERT } = this.cqn
-    const extract = !(INSERT?.entries || UPSERT?.entries) && (INSERT?.rows || UPSERT?.rows)
-      ? `value->>${this.string(`$[${this.columns.indexOf(name)}]`)}`
-      : `value->>${this.string(`$.${JSON.stringify(name)}`)}`
+    const extract = (INSERT?.entries || UPSERT?.entries)
+      ? `value->>${this.string(`$.${JSON.stringify(name)}`)}`
+      : (INSERT?.rows || UPSERT?.rows)
+        ? `value->>${this.string(`$[${this.columns.indexOf(name)}]`)}`
+        : `NEW.${this.quote(name)}` // in case of (INSERT?.from || UPSERT?.from)
     const sql = converter?.(extract) || extract
     return { extract, sql }
   }
@@ -1587,7 +1589,9 @@ class CQN2SQLRenderer {
   }
 
   managed_default(name, managed, src) {
-    return `(CASE WHEN json_type(value,${this.managed_extract(name).extract.slice(8)}) IS NULL THEN ${managed} ELSE ${src} END)`
+    const { UPSERT, INSERT } = this.cqn
+    const isJson = INSERT?.entries || UPSERT?.entries || INSERT?.rows || UPSERT?.rows
+    return `(CASE WHEN ${isJson ? `json_type(value,${this.managed_extract(name).extract.slice(8)})` : `NEW.${this.quote(name)}`} IS NULL THEN ${managed} ELSE ${src} END)`
   }
 }