@sap/cds 6.8.1 → 6.8.3

package/CHANGELOG.md

@@ -4,6 +4,26 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 6.8.3 - 2023-06-13
+
+### Fixed
+
+- `cds build` no longer reports CAP Java Classic runtime usage by mistake.
+- `cds version` prints the local `@sap/cds` version, even if called from a different `@sap/cds` installation.
+- User challenges handling in case of `cds.env.auth.restrict_all_services: false`
+
+## Version 6.8.2 - 2023-05-26
+
+### Fixed
+
+- EDMX texts for extended tenants based on `@sap/cds-mtx` now appear correctly again.
+- `@assert.range` for DateTime/Date/Time/Timestamp
+- Nested `$expand` OData query to the `texts` compiler-generated composition for entities with localized elements.
+For example, similar OData requests `Entity?$expand=items($expand=item($expand=texts))` now should work as expected.
+- `req.subject` would occasionally be incorrect when a query had been executed prior to it.
+- cds plugins are also fetched from `devDependencies`
+- `cds build` now correctly resolves complex models of mtx extension projects
+
 ## Version 6.8.1 - 2023-05-04
 
 ### Fixed

package/README.md

@@ -11,3 +11,4 @@ In case you find a bug, please report an [incident](https://cap.cloud.sap/docs/r
 ## License
 
 This package is provided under the terms of the [SAP Developer License Agreement](https://tools.hana.ondemand.com/developer-license-3.1.txt).
+

package/bin/build/provider/mtx-extension/index.js

@@ -32,7 +32,7 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
         if (model) {
             // extension CSN using parsed format
             const options = { ...this.options(), flavor: 'parsed' }
-            const extModel = await cds.load(this.resolveModel(), options)
+            const extModel = await cds.load(this._resolveExtensionFiles(model), options)
             if (extModel.requires) {
                 extModel.requires.length = 0
             }
@@ -79,6 +79,18 @@ class MtxExtensionModuleBuilder extends BuildTaskHandlerInternal {
         await new ResourcesTarBuilder(this).writeTarFile(path.join(this.task.dest, 'extension.tgz'), destExt)
     }
 
+    _resolveExtensionFiles(model) {
+        const node_modules = path.join(this.task.src, 'node_modules')
+        const paths = model['$sources'].reduce((acc, file) => {
+            if (file.startsWith(this.task.src) && !file.startsWith(node_modules)) {
+                acc.push(file)
+            }
+            return acc
+        }, [])
+
+        return paths
+    }
+
     _lintExtModel(extModel, model) {
         const linter = this._linter()
         if (!linter) {

package/bin/build/util.js

@@ -88,7 +88,7 @@ async function isOldJavaStack(dirs) {
     if (files.length > 0) {
         return (await Promise.all(files.map(async file => {
             const content = await fs.promises.readFile(file, 'utf-8')
-            return content && /<groupId>\s*com\.sap\.cloud\.servicesdk/.test(content) && !(/<groupId>\s*com\.sap\.cds\s*<\/groupId>/.test(content) && /<artifactId>\s*cds-/.test(content))
+            return content && /<groupId>\s*com\.sap\.cloud\.servicesdk\.prov\s*<\/groupId>/.test(content)
         }))).some(result => result)
     }
     return false

package/bin/plugins.js

@@ -14,7 +14,8 @@ module.exports = async function load_plugins (log = console.log) {
     }
   } else
     try {
-      const { dependencies } = require(cds.root + '/package.json')
+      const pkg = require(cds.root + '/package.json')
+      const dependencies = { ...pkg.dependencies, ...(process.env.NODE_ENV !== 'production' && pkg.devDependencies) }
       for (let each in dependencies) {
         plugins.push(_load_plugin(each + '/cds-plugin'))
       }

package/bin/version.js

@@ -57,6 +57,7 @@ function list_versions(args, options) { //NOSONAR
 function info(o) {
   const { npmGlobalModules } = require('./utils/modules');
   const main = _findPackage (require.main.filename)
+  const sap_cds = require.resolve('@sap/cds/package.json', {paths:[process.cwd(), __dirname]})
   return {
     // REVISIT: Why do we need all these different hard-coded ways, including proliferation of arguments?
     ..._versions4(main, {}, true),  // usually sap/cds-dk or sap/cds
@@ -66,6 +67,7 @@ function info(o) {
     ..._versions4(process.cwd(), {}, null, o),
     ..._versions4('..', {}, null, o),
     ..._findMTX(),
+    '@sap/cds': require(sap_cds).version, // ensure effective sap/cds version is listed
     'Node.js': process.version,
     'home': __dirname.slice(0,-4)
   }
@@ -84,6 +86,7 @@ function _versions4 (pkg_name, info, parent, o={}) {
     }
     const pkg = require(path)
     info[o.label || pkg.name] = pkg.version
+    // console.log(o.label || pkg.name, pkg.version, path)
     if (!parent || o.all) for (let d in pkg.dependencies) { // recurse sap packages in dependencies...
       if (!(d in info) && (d.startsWith('@sap/') || d.startsWith('@cap-js/'))) _versions4(d, info, pkg.name, o)
     }

package/lib/compile/for/lean_drafts.js

@@ -128,7 +128,6 @@ module.exports = function cds_compile_for_lean_drafts(csn) {
       }
       draft.elements[each] = newEl
     }
-    // TODO: Redirect associations to localized
     return draft
   }
   for (const name in csn.definitions) {

package/lib/req/request.js

@@ -106,6 +106,7 @@ class Request extends require('./event') {
       // create key value pair without IsActiveEntity & adjust root target
       const keys = {}
       let id = item.id
+      if (!id) return
       for (let j = 0; j < item?.where?.length; j = j + 4) {
         const key = item.where[j].ref[0]
         const value = item.where[j + 2].val
@@ -126,7 +127,7 @@ class Request extends require('./event') {
   warn   (...args) { return this._messages.add (3, ...args) }
   error  (...args) { return this._errors.add (4, ...args) }
   reject (...args) {
-    if (args[0] === 401 && this._.req?.login) return this._.req.login()
+    if (args[0] === 401 && this._.req?.login && !this._.req?.logIn) return this._.req.login()
     let e = this.error(...args)
     if (!e.stack) Error.captureStackTrace (e = Object.assign(new Error,e), this.reject)
     throw e

package/libx/_runtime/cds-services/adapter/odata-v4/handlers/metadata.js

@@ -22,6 +22,8 @@ const metadata = service => {
       const { 'cds.xt.ModelProviderService': mps } = cds.services
       let edmx = mps
         ? await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
+        : cds.mtx && cds.mtx.isExtended(tenant)
+        ? await cds.mtx.getEdmx(tenant, service.definition.name, locale)
         : cds.localize(
             service.model,
             locale,

package/libx/_runtime/cds-services/util/assert.js

@@ -112,10 +112,33 @@ const _checkISODateTime = value => (_checkString(value) && ISO_DATE_TIME_REGEX.t
 
 const _checkISOTimestamp = value => (_checkString(value) && ISO_TIMESTAMP_REGEX.test(value)) || value instanceof Date
 
-const _checkInRange = (val, range) => {
-  return _checkISODate(val)
-    ? (new Date(val) - new Date(range[0])) * (new Date(val) - new Date(range[1])) <= 0
-    : (val - range[0]) * (val - range[1]) <= 0
+const _checkDateValue = (val, r1, r2) => {
+  const dateVal = new Date(val)
+  return (dateVal - new Date(r1)) * (dateVal - new Date(r2)) <= 0
+}
+
+const _toDate = val => `2000-01-01T${val}Z`
+
+const _checkInRange = (val, range, type) => {
+  switch (type) {
+    case 'cds.Date':
+      return _checkISODate(val) && _checkDateValue(val, range[0], range[1])
+    case 'cds.DateTime':
+      return _checkISODateTime(val) && _checkDateValue(val, range[0], range[1])
+    case 'cds.Timestamp':
+      return _checkISOTimestamp(val) && _checkDateValue(val, range[0], range[1])
+    case 'cds.Time':
+      return _checkISOTime(val) && _checkDateValue(_toDate(val), _toDate(range[0]), _toDate(range[1]))
+    default:
+      return (val - range[0]) * (val - range[1]) <= 0
+  }
+}
+
+const _resolveCDSType = element => {
+  if (element.type.startsWith('cds.')) return element.type
+  if (!element.type) return
+
+  return _resolveCDSType(element.__proto__)
 }
 
 // process.env.CDS_ASSERT_FORMAT_FLAGS not official!
@@ -227,7 +250,7 @@ const _checkEnumElement = (element, value, errors, key, pathSegmentsInfo) => {
 
 const _checkRangeElement = (element, value, errors, key, pathSegmentsInfo) => {
   const rangeElements = element['@assert.range'] && !_getEnumElement(element) ? element['@assert.range'] : undefined
-  if (rangeElements && !_checkInRange(value, rangeElements)) {
+  if (rangeElements && !_checkInRange(value, rangeElements, _resolveCDSType(element))) {
     const args = [value, ...element['@assert.range']]
     errors.push(assertError({ code: ASSERT_RANGE, args }, element, value, key, pathSegmentsInfo))
   }

package/libx/_runtime/common/aspects/any.js

@@ -40,11 +40,14 @@ const _relationHandler = relation => ({
         if (newRelation) {
           target[prop] = new Proxy(_exposeRelation(newRelation), _relationHandler(newRelation))
         }
+
         return target[prop]
       }
+
       target[prop] = path.reduce((relation, value) => relation[value] || relation.csn._relations[value], relation)
       target[prop].path = path
     }
+
     return target[prop]
   }
 })

package/libx/_runtime/common/generic/crud.js

@@ -43,6 +43,7 @@ exports.impl = cds.service.impl(function () {
     // - INSERT has no where clause to do this in one roundtrip
     // - SELECT returns [] -> really empty collection or invalid path?
     let pathExistsQuery
+
     const { ref } = (req.query.INSERT && req.query.INSERT.into) || (req.query.SELECT && req.query.SELECT.from) || {}
     // REVISIT: why is copy necessary?
     if (ref && ref.length > 1) pathExistsQuery = SELECT(1).from({ ref: deepCopyArray(ref.slice(0, -1)) })
@@ -59,7 +60,6 @@ exports.impl = cds.service.impl(function () {
 
       // if no keys available, select all columns so we can delete the singleton with same content
       if (keyColumns.length) selectSingleton.columns(keyColumns)
-
       const singleton = await cds.tx(req).run(selectSingleton)
       if (!singleton) req.reject(404)
 

package/libx/_runtime/common/utils/generateOnCond.js

@@ -8,6 +8,7 @@ const _toRef = (alias, column) => {
 const _adaptRefs = (onCond, path, { select, join }) => {
   const _adaptEl = el => {
     const ref = el.ref
+
     if (ref) {
       if (ref[0] === path.join('_') && ref[1]) {
         return _toRef(select, ref.slice(1))
@@ -19,41 +20,34 @@ const _adaptRefs = (onCond, path, { select, join }) => {
       }
 
       return _toRef(join, ref.slice(0))
-    } else if (el.xpr) {
-      return { xpr: el.xpr.map(_adaptEl) }
     }
 
+    if (el.xpr) return { xpr: el.xpr.map(_adaptEl) }
     return el
   }
+
   return onCond.map(_adaptEl)
 }
 
 const _args = (csnElement, path, aliases) => {
   const onCond = csnElement.on
-
-  if (!onCond || !onCond.length) {
-    return []
-  }
-
-  if (onCond.length < 3) {
-    return onCond
-  }
-
+  if (!onCond || onCond.length === 0) return []
+  if (onCond.length < 3 && !onCond[0]?.xpr) return onCond
   if (!csnElement._isSelfManaged) return _adaptRefs(onCond, path, aliases)
 
   // revert join and select aliases because of backlink
-  const oc = _newOnConditions(csnElement._backlink, [csnElement._backlink.name], {
+  const mutOnCond = _newOnConditions(csnElement._backlink, [csnElement._backlink.name], {
     select: aliases.join,
     join: aliases.select
   })
 
   if (onCond.some(e => e === 'and')) {
-    // managed with ON-conditions must contain `$self`, which we replace with `oc`
-    const onCondWithouSelf = _adaptRefs(_onCondWithout$self(onCond), path, aliases)
-    oc.push('and', ...onCondWithouSelf)
+    // managed with ON-conditions must contain `$self`, which we replace with `mutOnCond`
+    const onCondWithoutSelf = _adaptRefs(_onCondWithout$self(onCond), path, aliases)
+    mutOnCond.push('and', ...onCondWithoutSelf)
   }
 
-  return oc
+  return mutOnCond
 }
 
 const _isSelfRef = e => e && e.ref && e.ref[0] === '$self'
@@ -64,23 +58,27 @@ const _onCondWithout$self = onCond => {
     if (e === 'and') return _isSelfRef(on[i + 1]) || _isSelfRef(on[i + 3])
     return on[i + 1] === '=' && (_isSelfRef(e) || _isSelfRef(on[i + 2]))
   })
+
   onCondWithoutSelf.splice(selfIndex, 4)
   return onCondWithoutSelf
 }
 
+// this is only for 2one managed w/o on-conditions, i.e. no static values are possible
 const _foreignToOn = (csnElement, path, { select, join }) => {
-  // this is only for 2one managed w/o ON-conditions i.e. no static values are possible
   const on = []
+
   for (const key of csnElement._foreignKeys) {
     if (on.length !== 0) {
       on.push('and')
     }
+
     const prefixChild = prefixForStruct(key.childElement)
     const ref1 = _toRef(select, prefixChild + key.childElement.name)
     const structPrefix = path.length > 1 ? path.slice(0, -1) : []
     const ref2 = _toRef(join, [...structPrefix, key.parentElement.name])
     on.push(ref1, '=', ref2)
   }
+
   return on
 }
 
@@ -93,10 +91,8 @@ const _newOnConditions = (csnElement, path, aliases) => {
 }
 
 const getOnCond = (csnElement, path = [], aliases = { select: '', join: '' }) => {
-  const oncond = _newOnConditions(csnElement, path, aliases)
-  return [{ xpr: oncond }]
+  const onCond = _newOnConditions(csnElement, path, aliases)
+  return [{ xpr: onCond }]
 }
 
-module.exports = {
-  getOnCond
-}
+module.exports = { getOnCond }

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -117,11 +117,9 @@ class JoinCQNFromExpanded {
   _createJoinCQNFromExpanded(SELECT, toManyTree, defaultLanguage) {
     const joinArgs = SELECT.from.args
     const isJoinOfTwoSelects = joinArgs?.every(a => a.SELECT)
-
     const unionTableRef = this._getUnionTable(SELECT)
     const unionTable = unionTableRef?.table
     const tableAlias = this._getTableAlias(SELECT, toManyTree)
-
     const readToOneCQN = this._getReadToOneCQN(SELECT, isJoinOfTwoSelects ? 'filterExpand' : tableAlias)
 
     if (isJoinOfTwoSelects) {
@@ -133,6 +131,7 @@ class JoinCQNFromExpanded {
         .forEach(c => {
           mappings[c.as.replace(prefix, '')] = c.as
         })
+
       // expand to one
       const entity = this._csn.definitions[joinArgs[0].SELECT.from.SET.args[1].SELECT.from.ref[0]]
       this._addImplicitOrderBy(readToOneCQN, entity, tableAlias)
@@ -146,9 +145,7 @@ class JoinCQNFromExpanded {
       const entity = this._getEntityForTable(table)
       this._addImplicitOrderBy(readToOneCQN, entity, tableAlias)
       if (unionTable) readToOneCQN[IS_UNION_DRAFT] = true
-
       readToOneCQN[IS_ACTIVE] = isDraftTree ? this._isDraftTargetActive(table) : true
-
       const givenColumns = readToOneCQN.columns
       readToOneCQN.columns = []
       if (entity['@cds.localized'] === false) defaultLanguage = true
@@ -500,11 +497,11 @@ class JoinCQNFromExpanded {
   _expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage }) {
     const toManyColumns = []
     const mappings = this._getMappingObject(toManyTree)
-
     const readToOneCQNCopy = getCqnCopy(readToOneCQN)
 
     for (const column of givenColumns) {
       let navigation
+
       if (column.expand) {
         navigation = getNavigationIfStruct(entity, tableAlias === column.ref[0] ? column.ref.slice(1) : column.ref)
         if (this._skip(navigation && navigation._target)) continue
@@ -520,6 +517,7 @@ class JoinCQNFromExpanded {
         // Expands with to one target can be processed directly
         const navProp = column.ref[column.ref.length - 1]
         const navTarget = entity.elements[navProp]
+
         if (
           entity._isDraftEnabled &&
           navTarget._isAssociationStrict &&
@@ -529,6 +527,7 @@ class JoinCQNFromExpanded {
         ) {
           mappings[navProp] = { [TO_ACTIVE]: true }
         }
+
         this._addJoinAndElements({
           column,
           entity,
@@ -539,7 +538,8 @@ class JoinCQNFromExpanded {
         })
       } else {
         // No expand, directly add the column and its mapping.
-        readToOneCQN.columns.push(this._addAliasToColumn(column, entity, tableAlias, mappings))
+        const columnAliased = this._addAliasToColumn(column, entity, tableAlias, mappings)
+        readToOneCQN.columns.push(columnAliased)
 
         // REVISIT required for other cqn properties as well?
         this.adjustOrderBy(readToOneCQN.orderBy, mappings, column, tableAlias)
@@ -556,6 +556,7 @@ class JoinCQNFromExpanded {
         }
       }
     }
+
     // only as second step handle expand to many, or else keys might still be unknown
     this._toMany({
       entity,
@@ -658,7 +659,6 @@ class JoinCQNFromExpanded {
     const extendedToManyTree = toManyTree.concat(column.ref[0] === parentAlias ? column.ref.slice(1) : column.ref)
     const tableAlias = this._createAlias(extendedToManyTree.join(':'))
     const target = this._getTarget(entity, column, parentAlias)
-
     const name = column.ref[column.ref.length - 1]
     const element = name && entity.elements[name]
 
@@ -765,8 +765,7 @@ class JoinCQNFromExpanded {
     const givenColumns = column.expand.map(col => {
       if (
         activeTableRequired &&
-        col.ref &&
-        col.ref.length &&
+        col.ref?.length &&
         (col.ref[0] === 'IsActiveEntity' || col.ref[0] === 'HasActiveEntity')
       ) {
         return {
@@ -974,9 +973,7 @@ class JoinCQNFromExpanded {
    */
   _addAliasToColumn(column, entity, tableAlias, mappings) {
     // No identifier for this row entry or technical column
-    if (this._isAliasNotNeeded(column)) {
-      return column
-    }
+    if (this._isAliasNotNeeded(column)) return column
 
     if (Array.isArray(column.xpr)) {
       return this._buildNewAliasColumn(
@@ -995,6 +992,7 @@ class JoinCQNFromExpanded {
         mappings
       )
     }
+
     return this._buildNewAliasColumn(column, entity, tableAlias, mappings)
   }
 
@@ -1075,10 +1073,7 @@ class JoinCQNFromExpanded {
     defaultLanguage,
     readToOneCQNCopy
   }) {
-    if (toManyColumns.length === 0) {
-      return
-    }
-
+    if (toManyColumns.length === 0) return
     this._addKeysIfNeeded({ entity, readToOneCQN, tableAlias })
 
     for (const { column, parentAlias } of toManyColumns) {
@@ -1091,6 +1086,7 @@ class JoinCQNFromExpanded {
         parentAlias,
         defaultLanguage
       })
+
       this._createJoinCQNFromExpanded(select, toManyTree.concat([column.ref[column.ref.length - 1]]), defaultLanguage)
     }
   }
@@ -1162,7 +1158,6 @@ class JoinCQNFromExpanded {
   // eslint-disable-next-line complexity
   _buildExpandedCQN({ column, entity, readToOneCQN, toManyTree, mappings, parentAlias, defaultLanguage }) {
     const isUnion = !!readToOneCQN.from.SET
-
     const colRef = parentAlias === column.ref[0] ? column.ref.slice(1) : column.ref.slice(0)
     const element = entity.elements[colRef[0]]
     const colTarget = ensureUnlocalized(element.target)
@@ -1170,24 +1165,21 @@ class JoinCQNFromExpanded {
       defaultLanguage ||
       entity['@cds.localized'] === false ||
       this._csn.definitions[colTarget]['@cds.localized'] === false
-
     const expandActive =
       readToOneCQN[IS_ACTIVE] ||
       (element._isAssociationStrict && !element['@odata.draft.enclosed']) ||
       !this._csn.definitions[colTarget]._isDraftEnabled
-
     const ref = this._refFromRefByExpand(column.ref[0], colTarget, defaultLanguageThis, expandActive)
     const tableAlias = this._createAlias(toManyTree.concat(colRef).join(':'))
     const on = entity._relations[colRef[0]].join(tableAlias, 'filterExpand')
     const filterExpand = this._getFilterExpandCQN(readToOneCQN, on, parentAlias, entity.keys)
     const expandedEntity = this._csn.definitions[colTarget]
     const joinColumns = this._getJoinColumnsFromOnAddToMapping(mappings[colRef[0]], parentAlias, on, entity)
-
     let cqn = {
       from: {
         join: 'inner',
         args: [{ ref: [ref], as: tableAlias }, filterExpand],
-        on: on
+        on
       }
     }
 
@@ -1213,16 +1205,17 @@ class JoinCQNFromExpanded {
     }
 
     if (column.limit) throw getError(501, 'Pagination is not supported in expand')
-
     cqn = this._adaptWhereOrderBy(cqn, tableAlias)
 
     if (isUnion) {
       const cols = column.expand.filter(c => !c.expand && !(c.ref[0] in DRAFT_COLUMNS_MAP)).map(c => c.ref[0])
+
       // ensure the join columns are selected
       for (const each of joinColumns) {
         const col = each.ref[each.ref.length - 1]
         if (!cols.includes(col)) cols.push(col)
       }
+
       // ensure the foreign keys are selected in case of expand to one
       for (const each of cqn.columns) {
         if (each.expand) {
@@ -1240,14 +1233,17 @@ class JoinCQNFromExpanded {
         )
         const user = (cds.context && cds.context.user && cds.context.user.id) || 'anonymous'
         const unionFrom = getCQNUnionFrom(cols, ref.replace(/_drafts$/, ''), ref, ks, user)
+
         for (const each of cqn.columns) {
           if (!each.as) continue
+
           // replace val with ref
           if (each.as === 'IsActiveEntity' || each.as === 'HasActiveEntity') {
             delete each.val
             each.ref = [tableAlias, each.as]
             each.as = tableAlias + '_' + each.as
           }
+
           // ensure the cast
           if (
             each.as.match(/IsActiveEntity$/) ||
@@ -1257,6 +1253,7 @@ class JoinCQNFromExpanded {
             each.cast = { type: 'cds.Boolean' }
           }
         }
+
         const cs = cqn.columns
           .filter(c => !c.expand && c.ref && c.ref[0] === tableAlias)
           .map(c => ({ ref: [c.ref[1]] }))
@@ -1280,6 +1277,7 @@ class JoinCQNFromExpanded {
       const sort = element.sort
       if (element.args)
         return { func: element.func, args: this._copyOrderBy(element.args, alias, expandedEntity), sort }
+
       const ref =
         element.ref[0] === alias
           ? [...element.ref]
@@ -1288,6 +1286,7 @@ class JoinCQNFromExpanded {
           : this._isPathExpressionToOne(element.ref, expandedEntity)
           ? [alias, ...element.ref]
           : [alias, element.ref[1]]
+
       return (sort && { ref, sort }) || { ref }
     })
   }
@@ -1306,6 +1305,7 @@ class JoinCQNFromExpanded {
         where: where
       }
     }
+
     return {
       xpr: ['case', 'when', hasDraftQuery, 'IS NOT NULL', 'then', 'true', 'else', 'false', 'end'],
       as: 'HasDraftEntity',
@@ -1370,6 +1370,7 @@ class JoinCQNFromExpanded {
         outerColumns.push(...outerCols)
         continue
       }
+
       if (typeof entry === 'object' && entry.ref && entry.ref[0] === 'filterExpand') {
         columns.push(this._getColumnObjectForFilterExpand(readToOneCQN, parentAlias, entry.ref[1]))
         outerColumns.push({ ref: [entry.ref[1]] })
@@ -1466,6 +1467,7 @@ class JoinCQNFromExpanded {
           }
           struct = current.elements[key.replace(parentAlias + '_', '')]
         }
+
         // build value for spreading (cf. mapping[GET_KEY_VALUE])
         value = []
         for (const k in struct.elements) {
@@ -1482,7 +1484,8 @@ class JoinCQNFromExpanded {
 
   _addColumNames(entity, parentAlias, columnNames) {
     for (const keyName in entity.keys) {
-      if (entity.keys[keyName].is2one || entity.keys[keyName].is2many) continue
+      const key = entity.keys[keyName]
+      if (key.is2one || key.is2many) continue
       const columnNameAlt = keyName === 'IsActiveEntity' ? 'IsActiveEntity' : `${parentAlias}_${keyName}`
       if (!columnNames.includes(columnNameAlt)) {
         columnNames.push(columnNameAlt)
@@ -1511,6 +1514,7 @@ class JoinCQNFromExpanded {
         columns.push(...this._getJoinColumnsFromOnAddToMapping(mapping, parentAlias, entry.xpr, entity))
         continue
       }
+
       if (typeof entry === 'object' && entry.ref && entry.ref[0] !== 'filterExpand') {
         const as = entry.ref.join('_')
         columns.push({
@@ -1530,6 +1534,7 @@ class JoinCQNFromExpanded {
 
       for (const key of keyList) {
         const parts = key.split('_')
+
         // For draft-enabled entities, associations may not take over 'IsActiveEntity', e.g.
         // when a draft points to an active entity
         if (parts[parts.length - 1] !== 'IsActiveEntity') {
@@ -1577,7 +1582,6 @@ class JoinCQNFromExpanded {
     this._addMissingJoinElements(columns, joinColumns)
     this._addMissingKeyColumns(columns, tableAlias, keys, isActive, entity)
     this._addMissingParentKeyColumns(columns, 'filterExpand', parentKeys, isActive)
-
     return columns
   }
 
@@ -1606,11 +1610,13 @@ class JoinCQNFromExpanded {
         columns.push(this._createCalculatedBooleanColumn('IsActiveEntity', isActive))
         return
       }
+
       if (isActive) {
         if (columnName === 'HasActiveEntity') {
           columns.push(this._createCalculatedBooleanColumn('HasActiveEntity', false))
           return
         }
+
         if (columnName === 'HasDraftEntity') {
           columns.push(this._getHasDraftEntityXpr(entity, tableAlias))
           return

package/libx/_runtime/db/generic/rewrite.js

@@ -14,6 +14,9 @@ const _isLinked = req => {
 function handler(req) {
   if (typeof req.query === 'string') return
 
+  // invoke req.subject before it gets modified
+  req.subject
+
   if (!this.model) {
     // best-effort rewrite of path in from
     req.query = cqn2cqn4sql(req.query, { definitions: {} }, { service: this })

package/libx/_runtime/fiori/lean-draft.js

@@ -25,6 +25,30 @@ const DRAFT_ADMIN_ELEMENTS = [
   'DraftIsProcessedByMe'
 ]
 
+const _fillIsActiveEntity = (row, IsActiveEntity, target) => {
+  if (target.drafts) row.IsActiveEntity = IsActiveEntity
+  for (const key in target.associations) {
+    const prop = row[key]
+    if (!prop) continue
+    const el = target.elements[key]
+    const childIsActiveEntity = el._target.isDraft ? IsActiveEntity : true
+    if (Array.isArray(prop)) prop.map(r => _fillIsActiveEntity(r, childIsActiveEntity, el._target))
+    else if (typeof prop === 'object') _fillIsActiveEntity(prop, childIsActiveEntity, el._target)
+  }
+}
+
+// REVISIT: should not be necessary
+const _runWithContext = (srv, req, obj) => {
+  const r = new cds.Request(obj)
+  r.event // invoke getter
+  r._ = Object.assign(r._, req._)
+  if (req.getUriInfo) r.getUriInfo = () => req.getUriInfo()
+  if (req.getUrlObject) r.getUrlObject = () => req.getUrlObject()
+  r._.params = req.params
+  r._.query = req.query
+  return srv.dispatch(r)
+}
+
 /// It's important to wait for the completion of all promises, otherwise a rollback might happen too soon
 const _promiseAll = async array => {
   const results = await Promise.allSettled(array)
@@ -109,16 +133,15 @@ cds.ApplicationService.prototype.handle = async function (req) {
       (query.DELETE && 'DELETE') ||
       req.event
     _req.target = query._target
-    _req._ = Object.assign({}, req._ || {}) // don't share the same `_` object
-    _req._.params = req.params
     _req.params = req.params
+    _req._ = Object.assign({}, req._ || {})
+    _req._.params = req.params
     _req._.query = query
+    const props = ['_isRest', '_isOData', 'isConcurrentResource', 'isConditional', 'validateEtag']
+    props.forEach(p => {
+      if (req[p]) _req.p = req[p]
+    })
     _req._ = req._
-    _req._isRest = req._isRest
-    _req._isOData = req._isOData
-    _req.isConcurrentResource = req.isConcurrentResource
-    _req.isConditional = req.isConditional
-    _req.validateEtag = req.validateEtag
     const cqnData = _req.query.UPDATE?.data || _req.query.INSERT?.entries?.[0]
     if (cqnData) _req.data = cqnData // must point to the same object
     Object.defineProperty(_req, '_messages', {
@@ -369,17 +392,17 @@ const Read = {
         drafts = []
       }
     }
-    Read.merge(query._target, actives, drafts, (row, other) =>
-      other
-        ? Object.assign(row, other, { IsActiveEntity: true, HasActiveEntity: false, HasDraftEntity: true })
-        : Object.assign(row, {
-            IsActiveEntity: true,
-            HasActiveEntity: false,
-            HasDraftEntity: false,
-            DraftAdministrativeData: null,
-            DraftAdministrativeData_DraftUUID: null
-          })
-    )
+    Read.merge(query._target, actives, drafts, (row, other) => {
+      if (other) Object.assign(row, other, { HasActiveEntity: false, HasDraftEntity: true })
+      else
+        Object.assign(row, {
+          HasActiveEntity: false,
+          HasDraftEntity: false,
+          DraftAdministrativeData: null,
+          DraftAdministrativeData_DraftUUID: null
+        })
+      _fillIsActiveEntity(row, true, query._target)
+    })
     return _requested(actives, query)
   },
   unchanged: async function (run, query) {
@@ -421,12 +444,12 @@ const Read = {
       cds.context.user.id
     )
     const drafts = await run(draftsQuery)
-    Read.merge(query._target, drafts, [], row =>
+    Read.merge(query._target, drafts, [], row => {
       Object.assign(row, {
-        HasDraftEntity: false,
-        IsActiveEntity: false
+        HasDraftEntity: false
       })
-    )
+      _fillIsActiveEntity(row, false, query._drafts._target)
+    })
     return _requested(drafts, query)
   },
   all: async function (run, query) {
@@ -468,18 +491,17 @@ const Read = {
     const count = isFirstPage ? ownNewDrafts.length + (isCount ? actives[0]?.$count : actives.$count) : actives.$count
     if (isCount) return { $count: count }
 
-    Read.merge(query._target, ownDrafts, [], row =>
+    Read.merge(query._target, ownDrafts, [], row => {
       Object.assign(row, {
-        IsActiveEntity: false,
         HasDraftEntity: false
       })
-    )
+      _fillIsActiveEntity(row, false, query._drafts._target)
+    })
     Read.delete(query._target, actives, ownEditDrafts)
     const otherEditDrafts = await Read.complementaryDrafts(run, query, actives)
     Read.merge(query._target, actives, otherEditDrafts, (row, other) => {
       if (other) {
         Object.assign(row, {
-          IsActiveEntity: true,
           HasDraftEntity: true,
           HasActiveEntity: false,
           DraftAdministrativeData_DraftUUID: other.DraftAdministrativeData_DraftUUID,
@@ -487,13 +509,13 @@ const Read = {
         })
       } else {
         Object.assign(row, {
-          IsActiveEntity: true,
           HasDraftEntity: false,
           HasActiveEntity: false,
           DraftAdministrativeData_DraftUUID: null,
           DraftAdministrativeData: null
         })
       }
+      _fillIsActiveEntity(row, true, query._target)
     })
     const res = isFirstPage ? [...ownNewDrafts, ...ownEditDrafts, ...actives] : actives
     if (query.SELECT.count) res.$count = count
@@ -519,11 +541,11 @@ const Read = {
     const actives = drafts.length
       ? await run(query.where(Read.whereIn(query._target, drafts)))
       : Object.assign([], { $count: 0 })
-    Read.merge(query._target, actives, drafts, (row, other) =>
-      other
-        ? Object.assign(row, other, { IsActiveEntity: true, HasDraftEntity: true, HasActiveEntity: false })
-        : Object.assign({ IsActiveEntity: true, HasDraftEntity: false, HasActiveEntity: false })
-    )
+    Read.merge(query._target, actives, drafts, (row, other) => {
+      if (other) Object.assign(row, other, { HasDraftEntity: true, HasActiveEntity: false })
+      else Object.assign({ HasDraftEntity: false, HasActiveEntity: false })
+      _fillIsActiveEntity(row, true, query._target)
+    })
     return _requested(actives, query)
   },
   unsavedChangesByAnotherUser: async function (run, query) {
@@ -834,14 +856,14 @@ async function onNew(req) {
   let DraftUUID
   if (isRoot) DraftUUID = cds.utils.uuid()
   else {
-    const rootData = await this.run(
-      SELECT.one(req.query.INSERT.into.ref[0].id)
+    const rootData = await _runWithContext(this, req, {
+      query: SELECT.one(req.query.INSERT.into.ref[0].id)
         .columns([
           { ref: ['DraftAdministrativeData_DraftUUID'] },
           { ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] }
         ])
         .where(req.query.INSERT.into.ref[0].where)
-    )
+    })
     if (!rootData) req.reject(404)
     if (rootData.DraftAdministrativeData?.InProcessByUser !== req.user.id)
       req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [rootData.DraftAdministrativeData.InProcessByUser])
@@ -889,7 +911,7 @@ async function onNew(req) {
   delete draftData.IsActiveEntity
   const draftCQN = INSERT.into(req.target).entries(draftData)
 
-  await _promiseAll([cds.run(adminDataCQN), this.run(draftCQN)])
+  await _promiseAll([cds.run(adminDataCQN), _runWithContext(this, req, { query: draftCQN })])
   req._.readAfterWrite = true
   return { ...draftData, IsActiveEntity: false }
 }
@@ -935,12 +957,12 @@ async function onEdit(req) {
   // It's not possible to use `FOR UPDATE` in HANA if the view contains joins/unions. Unfortunately, we can't resolve the table entity
   // because we must trigger the app-service request on the target entity (which could be delegated to a remote service).
   // The best we can do is to catch a potential error
-  await this.run(activeCheck).catch(_ => {})
+  await _runWithContext(this, req, { query: activeCheck }).catch(_ => {})
 
   const [res, draft] = await _promiseAll([
-    this.run(activeCQN),
+    _runWithContext(this, req, { query: activeCQN }),
     // no user check must be done here...
-    this.run(existingDraft)
+    _runWithContext(this, req, { query: existingDraft })
   ])
 
   if (!res) req.reject(404)
@@ -952,7 +974,7 @@ async function onEdit(req) {
     for (const key in req.target.drafts.keys) keys[key] = res[key]
     await _promiseAll([
       DELETE.from('DRAFT.DraftAdministrativeData').where({ DraftUUID }),
-      this.run(DELETE.from(req.target.drafts).where(keys))
+      _runWithContext(this, req, { query: DELETE.from(req.target.drafts).where(keys) })
     ])
   }
 
@@ -973,7 +995,7 @@ async function onEdit(req) {
   res.DraftAdministrativeData_DraftUUID = DraftUUID
   res.HasActiveEntity = true
   delete res.DraftAdministrativeData
-  await this.run(INSERT.into(targetDraft).entries(res))
+  await _runWithContext(this, req, { query: INSERT.into(targetDraft).entries(res) })
 
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
@@ -995,18 +1017,28 @@ async function onCancel(req) {
     ])
   // do not add InProcessByUser restriction
   Object.defineProperty(draftDelete, '_draftParams', { value: draftParams, enumerable: false })
-  const draft = await this.run(draftDelete)
+  const draft = await _runWithContext(this, req, { query: draftDelete })
   if (draftParams.IsActiveEntity === false && !draft) req.reject(404)
   if (draft && draft.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id)
     req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [draft.DraftAdministrativeData?.InProcessByUser])
-  const deletes = !draft ? [] : [this.run(DELETE.from({ ref: req.query.DELETE.from.ref }))]
+  const queries = !draft ? [] : [_runWithContext(this, req, { query: DELETE.from({ ref: req.query.DELETE.from.ref }) })]
   if (draft && req.target['@Common.DraftRoot.ActivationAction'])
     // only for draft root
-    deletes.push(
+    queries.push(
       DELETE.from('DRAFT.DraftAdministrativeData').where({ DraftUUID: draft.DraftAdministrativeData_DraftUUID })
     )
-  if (draftParams.IsActiveEntity) deletes.push(this.run(DELETE.from({ ref: activeRef })))
-  await _promiseAll(deletes)
+  else
+    queries.push(
+      UPDATE('Draft.DraftAdministrativeData')
+        .data({
+          InProcessByUser: cds.context.user.id,
+          LastChangedByUser: cds.context.user.id,
+          LastChangeDateTime: cds.context.timestamp.toISOString()
+        })
+        .where({ DraftUUID: draft.DraftAdministrativeData_DraftUUID })
+    )
+  if (draftParams.IsActiveEntity) queries.push(_runWithContext(this, req, { query: DELETE.from({ ref: activeRef }) }))
+  await _promiseAll(queries)
   return req.data
 }
 
@@ -1026,7 +1058,7 @@ async function onPrepare(req) {
     .columns(keys)
     .where(where)
   Object.defineProperty(draftQuery, '_draftParams', { value: draftParams, enumerable: false })
-  const data = await this.run(draftQuery)
+  const data = await _runWithContext(this, req, { query: draftQuery })
   if (!data) req.reject(404)
   if (data.DraftAdministrativeData?.InProcessByUser !== req.user.id)
     req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [data.DraftAdministrativeData?.InProcessByUser])

package/libx/_runtime/hana/customBuilder/CustomReferenceBuilder.js

@@ -25,7 +25,8 @@ class CustomReferenceBuilder extends ReferenceBuilder {
         return
       }
 
-      this._outputObj.sql.push(ref.map(el => this._quoteElement(el)).join('.'))
+      const sql = ref.map(el => this._quoteElement(el)).join('.')
+      this._outputObj.sql.push(sql)
     }
   }
 

package/libx/_runtime/hana/execute.js

@@ -58,6 +58,7 @@ function _getProcedureName(sql) {
 function _hdbGetResultForProcedure(rows, args, outParameters) {
   // on hdb, rows already contains results for scalar params
   const result = rows || {}
+
   // merge table output params into scalar params
   if (args && args.length && outParameters) {
     const params = outParameters.filter(md => !(md.PARAMETER_NAME in rows))
@@ -65,6 +66,7 @@ function _hdbGetResultForProcedure(rows, args, outParameters) {
       result[params[i].PARAMETER_NAME] = args[i]
     }
   }
+
   return result
 }
 
@@ -79,6 +81,7 @@ function _hcGetResultForProcedure(stmt, resultSet, outParameters) {
       }
     }
   }
+
   // merge table output params into scalar params
   const params = Array.isArray(outParameters) && outParameters.filter(md => !(md.PARAMETER_NAME in result))
   if (params && params.length) {
@@ -91,6 +94,7 @@ function _hcGetResultForProcedure(stmt, resultSet, outParameters) {
       resultSet.nextResult()
     }
   }
+
   return result
 }
 
@@ -160,7 +164,6 @@ function _executeAsPreparedStatement(dbc, sql, values, reject, resolve) {
       }
 
       stmt.drop(() => {})
-
       resolve(result)
     })
   })
@@ -180,6 +183,7 @@ function _executeSimpleSQL(dbc, sql, values) {
     if (dbc.name !== 'hdb' && typeof values === 'object') {
       values = Object.values(values)
     }
+
     // ensure that stored procedure with parameters is always executed as prepared
     if (_hasValues(values) || !!_getProcedureName(sql)) {
       _executeAsPreparedStatement(dbc, sql, values, reject, resolve)
@@ -230,12 +234,12 @@ function executeSelectCQN(model, dbc, query, user, locale, txTimestamp) {
     ) {
       return expandV2(model, dbc, query, user, locale, txTimestamp, executeSelectCQN)
     }
+
     return _processExpand(model, dbc, query, user, locale, txTimestamp)
   }
 
   const { sql, values = [] } = _cqnToSQL(model, query, user, locale, txTimestamp)
   const postProcessMapper = getPostProcessMapper(HANA_TYPE_CONVERSION_MAP, model, query)
-
   return _executeSelectSQL(dbc, sql, values, query.SELECT.one, postProcessMapper)
 }
 
@@ -245,17 +249,17 @@ function _getValuesProxy(values) {
       if (prop.length > 1 && prop.startsWith(':')) {
         return Object.getOwnPropertyDescriptor(obj, prop.slice(1))
       }
+
       return Object.getOwnPropertyDescriptor(obj, prop)
     },
     get: (obj, prop) => {
       if (prop.length > 1 && prop.startsWith(':')) {
         return obj[prop.slice(1)]
       }
+
       return obj[prop]
     },
-    ownKeys: target => {
-      return Reflect.ownKeys(target).map(key => `:${key}`)
-    }
+    ownKeys: target => Reflect.ownKeys(target).map(key => `:${key}`)
   })
 }
 
@@ -276,6 +280,7 @@ function executeInsertCQN(model, dbc, query, user, locale, txTimestamp) {
     if (dbc.name === 'hdb') {
       return writeStreamWithHdb(dbc, sql, values)
     }
+
     return writeStreamWithHanaClient(dbc, sql, values)
   }
 
@@ -284,6 +289,7 @@ function executeInsertCQN(model, dbc, query, user, locale, txTimestamp) {
     const affectedRowsCount = Array.isArray(affectedRows)
       ? affectedRows.reduce((sum, rows) => sum + rows, 0)
       : affectedRows
+
     if (entriesOrRows && entriesOrRows.length !== affectedRowsCount) {
       LOG._warn &&
         LOG.warn(
@@ -295,13 +301,17 @@ function executeInsertCQN(model, dbc, query, user, locale, txTimestamp) {
             query
           }
         )
+
       throw new Error('Possible data loss by INSERT into HANA db. Please, update a corresponding HANA driver.')
     }
+
     // InsertResult needs an object per row with its values
     // query.INSERT.values -> one row
     if (query.INSERT.values) return [{ affectedRows: 1, values: [values] }]
+
     // query.INSERT.entries or .rows -> multiple rows
     if (entriesOrRows) return values.map(v => ({ affectedRows: 1, values: v }))
+
     // INSERT into SELECT
     return [{ affectedRows }]
   })
@@ -331,20 +341,17 @@ function executeGenericCQN(model, dbc, query, user, locale, txTimestamp) {
 async function executeSelectStreamCQN(model, dbc, query, user, locale, txTimestamp) {
   const { sql, values = [] } = _cqnToSQL(model, query, user, locale, txTimestamp)
   let result
+
   if (dbc.name === 'hdb') {
     result = await readStreamWithHdb(dbc, sql, values)
   } else {
     result = await readStreamWithHanaClient(dbc, sql, values)
   }
 
-  if (result.length === 0) {
-    return
-  }
+  if (result.length === 0) return
 
   const val = Object.values(result[0])[0]
-  if (val === null) {
-    return null
-  }
+  if (val === null) return null
 
   return { value: val }
 }

package/libx/_runtime/remote/Service.js

@@ -38,6 +38,7 @@ const _setCorrectValue = (el, data, params, kind) => {
 const _buildPartialUrlFunctions = (url, data, params, kind = 'odata-v4') => {
   const funcParams = []
   const queryOptions = []
+
   // REVISIT: take params from params after importer fix (the keys should not be part of params)
   for (const param in _extractParamsFromData(data, params)) {
     if (kind === 'odata-v2') {
@@ -47,6 +48,7 @@ const _buildPartialUrlFunctions = (url, data, params, kind = 'odata-v4') => {
       queryOptions.push(`@${param}=${_setCorrectValue(param, data, params, kind)}`)
     }
   }
+
   return kind === 'odata-v2'
     ? `${url}?${funcParams.join('&')}`
     : `${url}(${funcParams.join(',')})?${queryOptions.join('&')}`
@@ -61,9 +63,11 @@ const _extractParamsFromData = (data, params = {}) => {
 
 const _buildKeys = (req, kind) => {
   const keys = []
+
   if (req.params && req.params.length > 0) {
     const p1 = req.params[0]
     if (typeof p1 !== 'object') return [p1]
+
     for (const key in req.target.keys) {
       keys.push(`${key}=${formatVal(p1[key], key, req.target, kind)}`)
     }
@@ -73,6 +77,7 @@ const _buildKeys = (req, kind) => {
       keys.push(`${key}=${formatVal(req.data[key], key, req.target, kind)}`)
     }
   }
+
   return keys
 }
 
@@ -98,6 +103,7 @@ const _handleUnboundActionFunction = (srv, def, req, event) => {
       def &&
       def.returns &&
       (def.returns.type === 'cds.LargeBinary' || def.returns.type === 'cds.Binary')
+
     return srv.send({ method: 'POST', path: `/${event}`, data: req.data, _binary: isBinary })
   }
 
@@ -121,22 +127,26 @@ const _handleV2ActionFunction = (srv, def, req, event, kind) => {
 const _handleV2BoundActionFunction = (srv, def, req, event, kind) => {
   const params = []
   const data = req.data
+
   // REVISIT: take params from def.params, after importer fix (the keys should not be part of params)
   for (const param in _extractParamsFromData(req.data, def.params)) {
     params.push(`${param}=${formatVal(data[param], param, { elements: def.params }, kind)}`)
   }
+
   const keys = _buildKeys(req, this.kind)
   if (keys.length === 1 && typeof req.params[0] !== 'object') {
     params.push(`${Object.keys(req.target.keys)[0]}=${keys[0]}`)
   } else {
     params.push(...keys)
   }
+
   const url = `${`/${event}`}?${params.join('&')}`
   return _sendV2RequestActionFunction(srv, def, url)
 }
 
 const _addHandlerActionFunction = (srv, def, target) => {
   const event = def.name.match(/\w*$/)[0]
+
   if (target) {
     srv.on(event, target, async function (req) {
       const shortEntityName = req.target.name.replace(`${this.namespace}.`, '')
@@ -144,18 +154,18 @@ const _addHandlerActionFunction = (srv, def, target) => {
       const url = `/${shortEntityName}(${_buildKeys(req, this.kind).join(',')})/${this.namespace}.${event}`
       return _handleBoundActionFunction(srv, def, req, url)
     })
-  } else {
-    srv.on(event, async function (req) {
-      if (this.kind === 'odata-v2') return _handleV2ActionFunction(srv, def, req, event, this.kind)
-      return _handleUnboundActionFunction(srv, def, req, event)
-    })
+
+    return
   }
-}
 
-const _selectOnlyWithAlias = q => {
-  return q && q.SELECT && !q.SELECT._transitions && q.SELECT.columns && q.SELECT.columns.some(hasAliasedColumns)
+  srv.on(event, async function (req) {
+    if (this.kind === 'odata-v2') return _handleV2ActionFunction(srv, def, req, event, this.kind)
+    return _handleUnboundActionFunction(srv, def, req, event)
+  })
 }
 
+const _selectOnlyWithAlias = q => q?.SELECT && !q.SELECT._transitions && q.SELECT?.columns?.some(hasAliasedColumns)
+
 const resolvedTargetOfQuery = q => {
   const transitions = (typeof q === 'object' && (q.SELECT || q.INSERT || q.UPDATE || q.DELETE)._transitions) || []
   return transitions.length && [transitions.length - 1].target
@@ -213,6 +223,7 @@ class RemoteService extends cds.Service {
           // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
           const sdkUtils = require('@sap-cloud-sdk/util')
           sdkUtils.setGlobalLogLevel('error')
+
           // disable sdk logger once
           sdkLoggerDisabled = true
         } catch (err) {
@@ -264,7 +275,6 @@ class RemoteService extends cds.Service {
 
       let result = await run(reqOptions, additionalOptions)
       result = typeof query === 'object' && query.SELECT?.one && Array.isArray(result) ? result[0] : result
-
       return result
     })
   }
@@ -312,7 +322,6 @@ class RemoteService extends cds.Service {
       // REVISIT: We need to provide target explicitly because it's cached already within ensure_target
       const newReq = new cds.Request({ query: q, target: t, headers: req.headers, _resolved: true, method: req.method })
       const result = await super.dispatch(newReq)
-
       return postProcess(q, result, this, true)
     }
 

package/libx/_runtime/remote/utils/client.js

@@ -306,12 +306,9 @@ const run = async (
     // > axios received status >= 400 -> gateway error
     const msg = e?.response?.data?.error?.message?.value ?? e?.response?.data?.error?.message ?? e.message
     e.message = msg ? 'Error during request to remote service: \n' + msg : 'Request to remote service failed.'
-
-    const sanitizedError = _getSanitizedError(e, requestConfig, {
-      suppressRemoteResponseBody: suppressRemoteResponseBody
-    })
-
+    const sanitizedError = _getSanitizedError(e, requestConfig, { suppressRemoteResponseBody })
     const err = Object.assign(new Error(e.message), { statusCode: 502, reason: sanitizedError })
+
     LOG._warn && LOG.warn(err)
     throw err
   }
@@ -329,11 +326,7 @@ const run = async (
   ) {
     const e = new Error("Received content-type 'text/html' which is not part of accepted content types")
     e.response = response
-
-    const sanitizedError = _getSanitizedError(e, requestConfig, {
-      suppressRemoteResponseBody: suppressRemoteResponseBody
-    })
-
+    const sanitizedError = _getSanitizedError(e, requestConfig, { suppressRemoteResponseBody })
     const err = Object.assign(new Error(`Error during request to remote service: ${e.message}`), {
       statusCode: 502,
       reason: sanitizedError
@@ -383,6 +376,7 @@ const run = async (
     if (response.data.d) {
       return _purgeODataV2(response.data, resolvedTarget, returnType, requestConfig.headers)
     }
+
     return _purgeODataV4(response.data)
   }
 

package/libx/_runtime/sqlite/execute.js

@@ -114,8 +114,10 @@ function executeSelectCQN(model, dbc, query, user, locale, txTimestamp) {
     ) {
       return expandV2(model, dbc, query, user, locale, txTimestamp, executeSelectCQN)
     }
+
     return _processExpand(model, dbc, query, user, locale, txTimestamp)
   }
+
   const { sql, values = [] } = sqlFactory(
     query,
     {

package/libx/rest/middleware/update.js

@@ -9,7 +9,6 @@ const { deepCopyObject } = require('../../_runtime/common/utils/copy')
 
 module.exports = async (_req, _res, next) => {
   let { _srv: srv, _query: query, _target, _data, _params } = _req
-
   let result,
     status = 200
 
@@ -19,6 +18,7 @@ module.exports = async (_req, _res, next) => {
     try {
       // add the data (as copy, if upsert allowed)
       query.data(UPSERT_ALLOWED ? deepCopyObject(_data) : _data)
+
       // REVISIT: if PUT, req.method should be PUT -> Crud2Http maps UPSERT to PUT
       result = await srv.dispatch(new RestRequest({ query, _target, method: _req.method, params: _params }))
       if (_params && result) Object.assign(result, _params[_params.length - 1])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "6.8.1",
+  "version": "6.8.3",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [