@sap/cds 6.2.3 → 6.3.0

package/lib/utils/inflect.js

@@ -0,0 +1,24 @@
+const last = /\w+$/
+
+exports.singular4 = (dn,stripped) => {
+	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
+	return dn['@singular'] || (
+		/.*species|news$/i.test(n) ? n  :
+		/.*ess$/.test(n) ?  n :      							// Address
+		/.*ees$/.test(n) ? n.slice(0, -1) : 			// Employees --> Employee
+		/.*[sz]es$/.test(n) ?  n.slice(0, -2) :
+		/.*[^aeiou]ies$/.test(n) ? n.slice(0, -3) + 'y' :     // Deliveries --> Delivery
+		/.*s$/.test(n) ?  n.slice(0, -1) :
+		n
+	)
+}
+
+exports.plural4 = (dn,stripped) => {
+	let n = dn.name || dn; if (stripped) n = n.match(last)[0]
+	return dn['@plural'] || (
+		/.*analysis|status|species|news$/i.test(n) ? n  :
+		/.*[^aeiou]y$/.test(n) ? n.slice(0,-1) + 'ies'  :
+		/.*(s|x|z|ch|sh)$/.test(n) ? n + 'es' :
+		n + 's'
+	)
+}

package/libx/_runtime/auth/strategies/ias-auth.js

@@ -30,7 +30,7 @@ module.exports = function ias_auth(config) {
        This is NOT recommended in production!
        `)
 
-    return
+    return (req, res, next) => next()
   }
 
   passport.use('IAS', new JWTStrategy(config.credentials))

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

@@ -133,7 +133,15 @@ const getErrorHandler = (crashOnError = true, srv) => {
 
     // add content id if not generated by okra ("~...")
     const contentId = odataReq.getOdataRequestId()
-    if (contentId && !contentId.match(/^~/)) err['@Core.ContentID'] = contentId
+    if (contentId && !contentId.match(/^~/)) {
+      err['@Core.ContentID'] = contentId
+      // UI5 expects us to add the content ID to each detail message
+      if (err.details) {
+        err.details.forEach(entry => {
+          entry['@Core.ContentID'] = contentId
+        })
+      }
+    }
 
     const { error, statusCode } = normalizeError(err, req)
     // REVISIT: We should also pass stack traces in development

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

@@ -19,12 +19,29 @@ const metadata = service => {
     const locale = odataRes.getContract().getLocale()
 
     try {
-      let edmx = cds.localize(
-        service.model,
-        locale,
-        // REVISIT: we could cache this in model._cached
-        cds.compile.to.edmx(service.model, { service: service.definition.name })
-      )
+      const { 'cds.xt.ModelProviderService': mps } = cds.services
+      // REVISIT: The following block should replaced with the one commented bellow after the next release of cds-mtxs.
+      // Currently lkg tests fail w/o the try-catch.
+      let edmx
+      try {
+        if (mps) edmx = await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
+        // eslint-disable-next-line no-empty
+      } catch (_) {}
+      if (!edmx)
+        edmx = cds.localize(
+          service.model,
+          locale,
+          cds.compile.to.edmx(service.model, { service: service.definition.name })
+        )
+      /*      
+      let edmx = mps
+        ? await mps.getEdmx({ tenant, model: service.model, service: service.definition.name, locale })
+        : cds.localize(
+            service.model,
+            locale,
+            // REVISIT: we could cache this in model._cached
+            cds.compile.to.edmx(service.model, { service: service.definition.name })
+          ) */
       return next(null, toODataResult(edmx))
     } catch (e) {
       if (LOG._error) {

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

@@ -460,6 +460,7 @@ const read = service => {
 
     const changeset = odataReq.getAtomicityGroupId()
     const tx = changeset ? odataReq.getBatchApplicationData().txs[changeset] : service.tx(req)
+    // REVISIT: can be removed when pluggable middlewares are active
     cds.context = tx
 
     let result, err

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/validator/ValueValidator.js

@@ -85,6 +85,11 @@ class ValueValidator {
     this._mode = mode
   }
 
+  get property() {
+    return this._mode === 'decode' &&
+    this._valueConverter._propertyOrReturnType &&
+    this._valueConverter._propertyOrReturnType.getName()
+  }
   /**
    * Validates value of Edm.Binary type.
    * @param {Buffer} value - Edm.Binary value as base64 or base64url string
@@ -257,7 +262,10 @@ class ValueValidator {
           value +
           ' (JavaScript ' +
           typeof value +
-          '). The length of the ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
+          'The length of the ' +
           typeName +
           ' value must not be greater than the MaxLength facet value (' +
           maxLength +
@@ -344,7 +352,9 @@ class ValueValidator {
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The number of milliseconds does not correspond to the Precision facet value (' +
           precision +
           ').'
@@ -368,15 +378,16 @@ class ValueValidator {
     if (Number.isNaN(bigValue)) {
       throw this._valueError(value, 'Edm.Decimal', 'number or a string representing a number')
     }
-
     // check that the value has no more digits than specified for precision
     if (precision !== null && precision !== undefined && bigValue.c.length > precision) {
       throw new IllegalArgumentError(
-        'Invalid value ' +
+          'Invalid value ' +
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The specified Edm.Decimal value does not correspond to the Precision facet value (' +
           precision +
           ').'
@@ -397,7 +408,9 @@ class ValueValidator {
             value +
             ' (JavaScript ' +
             typeof value +
-            '). ' +
+            ')' +
+            (this.property ? ' for property "' + this.property + '"' : '') +
+            '. ' +
             'If Precision is equal to Scale, a single zero must precede the decimal point ' +
             'in the Edm.Decimal value.'
         )
@@ -413,7 +426,9 @@ class ValueValidator {
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The number of digits to the left of the decimal point must not be greater than ' +
           'Precision minus Scale, i.e., ' +
           (precision - scale) +
@@ -425,11 +440,13 @@ class ValueValidator {
     const decimalPart = bigValue.minus(integerPart)
     if (decimalPart.c.length > scale && !decimalPart.eq(0)) {
       throw new IllegalArgumentError(
-        'Invalid value ' +
+          'Invalid value ' +
           value +
           ' (JavaScript ' +
           typeof value +
-          '). ' +
+          ')' +
+          (this.property ? ' for property "' + this.property + '"' : '') +
+          '. ' +
           'The specified Edm.Decimal value has more digits to the right of the decimal point ' +
           'than allowed by the Scale facet value (' +
           scale +
@@ -705,18 +722,13 @@ class ValueValidator {
    * @private
    */
   _valueError (value, typeName, requiredText) {
-    const property =
-      this._mode === 'decode' &&
-      this._valueConverter._propertyOrReturnType &&
-      this._valueConverter._propertyOrReturnType.getName()
-
     const msg =
       'Invalid value ' +
       (typeName.includes('Geo') ? JSON.stringify(value) : value) +
       ' (JavaScript ' +
       typeof value +
       ')' +
-      (property ? ' for property "' + property + '"' : '') +
+      (this.property ? ' for property "' + this.property + '"' : '') +
       '. ' +
       'A ' +
       requiredText +

package/libx/_runtime/cds-services/adapter/odata-v4/utils/readAfterWrite.js

@@ -58,7 +58,7 @@ const readAfterWrite = async (req, srv, { operation, isBefore } = { isBefore: fa
   // gracefully set location and no body if no read auth or not readable capability
   let result
   try {
-    const _req = new Request({ query, event: 'READ', _: req._ })
+    const _req = new Request({ query, event: 'READ', _: req._, params: req.params })
     result = await srv.dispatch(_req)
     if (result && req.target._isDraftEnabled) removeDraftUUIDIfNecessary(req)(result)
     if (result === null && !isBefore && (_isWriteWithResponse(req) || _isDraftAction(req))) {

package/libx/_runtime/cds-services/services/utils/compareJson.js

@@ -77,7 +77,7 @@ const _hasOpDeep = (entry, element) => {
   return false
 }
 
-const _addCompositionsToResult = (result, entity, prop, newValue, oldValue) => {
+const _addCompositionsToResult = (result, entity, prop, newValue, oldValue, opts) => {
   /*
    * REVISIT: the current impl results in {} instead of keeping null for compo to one.
    *          unfortunately, many follow-up errors occur (e.g., prop in null checks) if changed.
@@ -89,9 +89,9 @@ const _addCompositionsToResult = (result, entity, prop, newValue, oldValue) => {
     !Array.isArray(newValue[prop]) &&
     Object.keys(newValue[prop]).length === 0
   ) {
-    composition = compareJsonDeep(entity.elements[prop]._target, undefined, oldValue && oldValue[prop])
+    composition = compareJsonDeep(entity.elements[prop]._target, undefined, oldValue && oldValue[prop], opts)
   } else {
-    composition = compareJsonDeep(entity.elements[prop]._target, newValue[prop], oldValue && oldValue[prop])
+    composition = compareJsonDeep(entity.elements[prop]._target, newValue[prop], oldValue && oldValue[prop], opts)
   }
   if (composition.some(c => _hasOpDeep(c, entity.elements[prop]))) {
     result[prop] = entity.elements[prop].is2one ? composition[0] : composition
@@ -154,7 +154,7 @@ const _skipToMany = (entity, prop) => {
   return entity.elements[prop] && entity.elements[prop].is2many && _skip(entity, prop)
 }
 
-const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity) => {
+const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity, opts) => {
   // On app-service layer, generated foreign keys are not enumerable,
   // include them here too.
   for (const prop of Object.getOwnPropertyNames(newEntry)) {
@@ -164,7 +164,7 @@ const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity) => {
     }
 
     // if value did not change --> ignored
-    if (newEntry[prop] === (oldEntry && oldEntry[prop]) || prop in DRAFT_COLUMNS_MAP) {
+    if (newEntry[prop] === (oldEntry && oldEntry[prop]) || (opts.ignoreDraftColumns && prop in DRAFT_COLUMNS_MAP)) {
       continue
     }
 
@@ -177,7 +177,7 @@ const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity) => {
     }
 
     if (entity.elements[prop] && entity.elements[prop].isComposition) {
-      _addCompositionsToResult(result, entity, prop, newEntry, oldEntry)
+      _addCompositionsToResult(result, entity, prop, newEntry, oldEntry, opts)
       continue
     }
 
@@ -185,7 +185,7 @@ const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity) => {
   }
 }
 
-const compareJsonDeep = (entity, newValue = [], oldValue = []) => {
+const compareJsonDeep = (entity, newValue = [], oldValue = [], opts) => {
   const resultsArray = []
   const keys = _getKeysOfEntity(entity)
 
@@ -200,7 +200,7 @@ const compareJsonDeep = (entity, newValue = [], oldValue = []) => {
 
     _addKeysToEntryIfNotExists(keys, newEntry)
 
-    _iteratePropsInNewEntry(newEntry, keys, result, oldEntry, entity)
+    _iteratePropsInNewEntry(newEntry, keys, result, oldEntry, entity, opts)
 
     resultsArray.push(result)
   }
@@ -259,8 +259,9 @@ const compareJsonDeep = (entity, newValue = [], oldValue = []) => {
  *
  * @returns {Array}
  */
-const compareJson = (newValue, oldValue, entity) => {
-  const result = compareJsonDeep(entity, newValue, oldValue)
+const compareJson = (newValue, oldValue, entity, opts = {}) => {
+  const options = Object.assign({ ignoreDraftColumns: false }, opts)
+  const result = compareJsonDeep(entity, newValue, oldValue, options)
 
   // in case of batch insert, result is an array
   // in all other cases it is an array with just one entry

package/libx/_runtime/cds-services/services/utils/differ.js

@@ -44,7 +44,7 @@ module.exports = class Differ {
     return cds
       .tx(req)
       .run(query)
-      .then(dbState => compareJson(undefined, dbState, req.target))
+      .then(dbState => compareJson(undefined, dbState, req.target, { ignoreDraftColumns: true }))
   }
 
   async _addPartialPersistentState(req) {
@@ -59,7 +59,7 @@ module.exports = class Differ {
     const combinedData = providedData || Object.assign({}, req.query.UPDATE.data || {}, req.query.UPDATE.with || {})
     const lastTransition = newQuery.UPDATE._transitions[newQuery.UPDATE._transitions.length - 1]
     const revertedPersistent = revertData(req._.partialPersistentState, lastTransition, this._srv)
-    return compareJson(combinedData, revertedPersistent, req.target)
+    return compareJson(combinedData, revertedPersistent, req.target, { ignoreDraftColumns: true })
   }
 
   async _diffPatch(req, providedData) {
@@ -73,7 +73,9 @@ module.exports = class Differ {
         .tx(req)
         .run(SELECT.from(draftRef).where(removeIsActiveEntityRecursively(where)).limit(1))
 
-      return compareJson(providedData || req.data, req._.partialPersistentState, req.target)
+      return compareJson(providedData || req.data, req._.partialPersistentState, req.target, {
+        ignoreDraftColumns: true
+      })
     }
   }
 
@@ -83,7 +85,7 @@ module.exports = class Differ {
         ? req.query.INSERT.entries[0]
         : req.query.INSERT.entries
 
-    return compareJson(originalData, undefined, req.target)
+    return compareJson(originalData, undefined, req.target, { ignoreDraftColumns: true })
   }
 
   async calculate(req, providedData) {

package/libx/_runtime/common/composition/data.js

@@ -8,6 +8,8 @@ const { cqn2cqn4sql } = require('../utils/cqn2cqn4sql')
 const cds = require('../../cds')
 const { SELECT } = cds.ql
 
+const CHUNK_SIZE = cds.env.features.chunk_deep || Number.MAX_VALUE
+
 /*
  * own utils
  */
@@ -62,13 +64,17 @@ const _getLinksOfCompTree = compositionTree => {
   return links
 }
 
-const _whereKeys = keys => {
-  const where = []
-  keys.forEach(key => {
-    if (where.length) where.push('or')
-    where.push({ xpr: [...ctUtils.whereKey(key)] })
-  })
-  return where
+const _whereKeys = keySet => {
+  if (!keySet.length || !Object.keys(keySet[0]).length) return []
+
+  const keys0 = Object.keys(keySet[0])
+  const keys = { list: keys0.map(pk => ({ ref: [pk] })) }
+  const values = {
+    list: keySet.map(row => ({
+      list: keys0.map(k => ({ val: row[k] }))
+    }))
+  }
+  return [keys, 'in', values]
 }
 
 const _parentKey = (element, key) => {
@@ -136,28 +142,19 @@ const _subWhere = (result, element) => {
   const links = [...element.backLinks, ...element.customBackLinks]
   if (result.length && links && links.length > 0) {
     where = {}
-    const chunkSize = cds.env.features.chunk_deep
     const keys0 = Object.keys(_getWhereObj(result[0], links))
-    if (chunkSize && result.length > chunkSize && keys0.length) {
+    if (keys0.length) {
       const keys = { list: keys0.map(pk => ({ ref: [pk] })) }
-      for (let i = 0; i < result.length; i += chunkSize) {
+      for (let i = 0; i < result.length; i += CHUNK_SIZE) {
         const values = {
-          list: result
-            .slice(i, i + chunkSize)
-            .map(row => ({ list: keys0.map(k => ({ val: _getWhereObj(row, links)[k] || null })) }))
+          list: result.slice(i, i + CHUNK_SIZE).map(row => ({
+            list: keys0.map(k => {
+              return { val: _getWhereObj(row, links)[k] }
+            })
+          }))
         }
         where[i] = [keys, 'in', values]
       }
-    } else {
-      where = []
-      for (const row of result) {
-        const whereObj = _getWhereObj(row, links)
-        const whereCQN = ctUtils.whereKey(whereObj)
-        if (whereCQN.length) {
-          if (where.length > 0) where.push('or')
-          where.push({ xpr: [...whereCQN] })
-        }
-      }
     }
   }
   return where
@@ -232,29 +229,22 @@ const _select = ({
 }
 
 const _selectDeepUpdateData = async args => {
-  const { model, compositionTree, entityName, data, root, selectData, tx, selectAllColumns } = args
+  const { model, compositionTree, entityName, data, root, selectData, tx, selectAllColumns, where, parentKeys } = args
   let result = []
-  const chunkSize = cds.env.features.chunk_deep
-  if (
-    chunkSize &&
-    !args.where &&
-    args.parentKeys &&
-    args.parentKeys.length > chunkSize &&
-    Object.keys(args.parentKeys[0]).length
-  ) {
-    const keys0 = Object.keys(args.parentKeys[0])
+  if (!where && parentKeys && parentKeys.length && Object.keys(parentKeys[0]).length) {
+    const keys0 = Object.keys(parentKeys[0])
     const keys = { list: keys0.map(pk => ({ ref: [pk] })) }
-    for (let i = 0; i < args.parentKeys.length; i += chunkSize) {
+    for (let i = 0; i < parentKeys.length; i += CHUNK_SIZE) {
       const values = {
-        list: args.parentKeys.slice(i, i + chunkSize).map(row => ({ list: keys0.map(k => ({ val: row[k] || null })) }))
+        list: parentKeys.slice(i, i + CHUNK_SIZE).map(row => ({ list: keys0.map(k => ({ val: row[k] })) }))
       }
-      const _args = { ...args, where: [keys, 'in', values] }
+      const _args = { ...args, where: [keys, 'in', values], parentKeys: undefined }
       const selectCQN = _select(_args)
       result.push(...(await tx.run(selectCQN)))
     }
-  } else if (chunkSize && args.where && !Array.isArray(args.where)) {
-    for (let where of Object.values(args.where)) {
-      const _args = { ...args, where }
+  } else if (where && !Array.isArray(where)) {
+    for (let w of Object.values(where)) {
+      const _args = { ...args, where: w }
       const selectCQN = _select(_args)
       result.push(...(await tx.run(selectCQN)))
     }
@@ -262,7 +252,6 @@ const _selectDeepUpdateData = async args => {
     const selectCQN = _select(args)
     result = await tx.run(selectCQN)
   }
-
   if (!result.length) return Promise.resolve(result)
 
   const keys = _keys(model.definitions[entityName], result)

package/libx/_runtime/common/composition/update.js

@@ -10,6 +10,8 @@ const { deepCopyObject } = require('../utils/copy')
 
 const getError = require('../../common/error')
 
+const CHUNK_SIZE = cds.env.features.chunk_deep || Number.MAX_VALUE
+
 /*
  * own utils
  */
@@ -35,13 +37,11 @@ const _dataByKey = (entity, data) => {
 }
 
 function _addSubDeepUpdateCQNForDelete({ entity, data, selectData, entityName, deleteCQNs }) {
-  const chunkSize = cds.env.features.chunk_deep
   const dataByKey = _dataByKey(entity, data)
-  if (chunkSize && selectData.length > chunkSize && Object.keys(selectData[0]).length) {
-    // REVISIT: Usage of "where in" syntax would be better
-    for (let j = 0; j < selectData.length; j += chunkSize) {
+  if (selectData.length && selectData[0] && Object.keys(selectData[0]).length) {
+    for (let j = 0; j < selectData.length; j += CHUNK_SIZE) {
       const deleteCQN = { DELETE: { from: entityName, where: [] } }
-      for (let i = j; i < j + chunkSize; i++) {
+      for (let i = j; i < j + CHUNK_SIZE && i < selectData.length; i++) {
         const selectEntry = selectData[i]
         if (!selectEntry) continue
         const dataEntry = dataByKey.get(_serializedKey(entity, selectEntry))
@@ -52,21 +52,8 @@ function _addSubDeepUpdateCQNForDelete({ entity, data, selectData, entityName, d
           deleteCQN.DELETE.where.push({ xpr: [...ctUtils.whereKey(ctUtils.key(entity, selectEntry))] })
         }
       }
-      deleteCQNs.push(deleteCQN)
-    }
-  } else {
-    const deleteCQN = { DELETE: { from: entityName, where: [] } }
-    for (const selectEntry of selectData) {
-      if (!selectEntry) continue
-      const dataEntry = dataByKey.get(_serializedKey(entity, selectEntry))
-      if (!dataEntry) {
-        if (deleteCQN.DELETE.where.length > 0) {
-          deleteCQN.DELETE.where.push('or')
-        }
-        deleteCQN.DELETE.where.push({ xpr: [...ctUtils.whereKey(ctUtils.key(entity, selectEntry))] })
-      }
+      if (deleteCQN.DELETE.where.length) deleteCQNs.push(deleteCQN)
     }
-    deleteCQNs.push(deleteCQN)
   }
 }
 

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

@@ -3,7 +3,7 @@ const { getDefaultPageSize, getMaxPageSize } = require('../utils/page')
 
 const commonGenericPaging = function (req) {
   // only if http request
-  if (!req._.req) return
+  if (!(req.http?.req || req._.req)) return
 
   // target === null if view with parameters
   if (!req.target || !req.query.SELECT || req.query.SELECT.one) return

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

@@ -353,7 +353,7 @@ const _newSelect = (query, transitions, service) => {
   if (!newSelect.columns && targetTransition.mapping.size) newSelect.columns = _initialColumns(targetTransition)
   if (newSelect.columns) {
     rewriteAsterisks({ SELECT: query.SELECT }, service.model, {
-      _4db: service instanceof cds.DatabaseService,
+      _4db: service instanceof cds.DatabaseService || service.kind === 'better-sqlite',
       target: targetTransition.queryTarget
     })
     newSelect.columns = _newColumns(newSelect.columns, targetTransition, service, service.kind !== 'app-service')
@@ -517,26 +517,20 @@ const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) =>
   if (!skipForbiddenViewCheck) _checkForForbiddenViews(target)
   const targetStartsWithSrvName = service.namespace && target.name.startsWith(`${service.namespace}.`)
   const persistenceTable = _isPersistenceTable(target)
-  columns = _queryColumns(
-    target,
-    columns,
-    persistenceTable,
-    !(service instanceof cds.DatabaseService) && !targetStartsWithSrvName
-  )
-  if (persistenceTable && service instanceof cds.DatabaseService) {
+  const isDatabaseService = service instanceof cds.DatabaseService || service.kind === 'better-sqlite'
+  columns = _queryColumns(target, columns, persistenceTable, !isDatabaseService && !targetStartsWithSrvName)
+  // REVISIT: Change once we expose database service
+  if (persistenceTable && isDatabaseService) {
     return { target, transitionColumns: columns }
   }
   // stop projection resolving if it starts with the service name prefix
-  if (!(service instanceof cds.DatabaseService) && targetStartsWithSrvName) {
+  if (!isDatabaseService && targetStartsWithSrvName) {
     return { target, transitionColumns: columns }
   }
   // continue projection resolving if the target is a projection
   if (target.query && target.query._target) {
     const newTarget = target.query._target
-    if (
-      service instanceof cds.DatabaseService ||
-      !(service.namespace && newTarget.name.startsWith(`${service.namespace}.`))
-    ) {
+    if (isDatabaseService || !(service.namespace && newTarget.name.startsWith(`${service.namespace}.`))) {
       return _getTransitionData(newTarget, columns, service, skipForbiddenViewCheck)
     }
     return { target: newTarget, transitionColumns: columns }

package/libx/_runtime/db/utils/generateAliases.js

@@ -57,6 +57,7 @@ const _generateAliases = (partialCqn, aliasMap = new Map()) => {
     _redirectXpr(partialCqn.SELECT.having, selectMap)
     _redirectXpr(partialCqn.SELECT.columns, selectMap)
     _redirectXpr(partialCqn.SELECT.groupBy, selectMap)
+    _redirectXpr(partialCqn.SELECT.orderBy, selectMap)
     return
   }
 

package/libx/_runtime/fiori/generic/read.js

@@ -187,16 +187,23 @@ const _getDraftPropertiesDetermineDraft = (req, where, tableName, calcDraftUUID
 }
 
 function _copyCQNPartial(partial) {
-  if (partial.SELECT && partial.SELECT.where) {
+  if (partial.SELECT) {
     const newPartial = Object.assign({}, partial)
     const newSELECT = Object.assign({}, partial.SELECT)
     newSELECT.from = _copyCQNPartial(partial.SELECT.from)
     newPartial.SELECT = newSELECT
+    if (partial.SELECT._4odata) newSELECT._4odata = true
     if (partial.SELECT.columns) newPartial.SELECT.columns = _copyArray(partial.SELECT.columns)
     if (partial.SELECT.where) newPartial.SELECT.where = _copyArray(partial.SELECT.where)
     return newPartial
   }
 
+  if (partial.id) {
+    const res = Object.assign({}, partial)
+    if (res.where) res.where = _copyArray(res.where)
+    return res
+  }
+
   if (partial.ref) {
     return Object.assign({}, partial, { ref: _copyArray(partial.ref) })
   }
@@ -1272,12 +1279,12 @@ const fioriGenericRead = async function (req) {
   req.target = _getLocalizedEntity(this.model, req.target, req.user) || req.target
 
   // REVISIT DRAFT HANDLING: cqn2cqn4sql must not be called here
-  const query4sql = cqn2cqn4sql(req.query, this.model, { _4fiori: true })
+  const query4sql = cqn2cqn4sql(_copyCQNPartial(req.query), this.model, { _4fiori: true })
 
   // Clone the request. Do not clone with Object.assign as that would skip all non-enumerable properties.
   // REVISIT: query4sql.clone() doesn't really clone the original query, hence _generateCQN will heavily modify
   // it, e.g. IsActiveEntity is stripped. This is a problem for subsequent handlers which rely on this information.
-  const reqClone = { __proto__: req, query: query4sql.clone() }
+  const reqClone = { __proto__: req, query: query4sql }
   // Clone draft restrictions to the cloned query.
   reqClone.query._draftRestrictions = query._draftRestrictions
 
@@ -1320,7 +1327,7 @@ const fioriGenericRead = async function (req) {
   _adaptColumns4readAfterWrite(req, cqnScenario, query4sql)
 
   const result = await cds.tx(req).send({ query: cqnScenario.cqn, target: req.target })
-  return _postProcess(result, req, cqnScenario, enhancedWithLastChangeDateTime)
+  return _postProcess(result, reqClone, cqnScenario, enhancedWithLastChangeDateTime)
 }
 
 module.exports = cds.service.impl(function (srv, entity) {

package/libx/_runtime/hana/execute.js

@@ -51,8 +51,8 @@ const BASE64 = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Z
 
 function _getProcedureName(sql) {
   // name delimited with "" allows any character
-  const match = sql.trim().match(/^call \s*(("(?<delimited>.+)")|(?<undelimited>\w+))\s*\(/i)
-  return match && (match.groups.undelimited || match.groups.delimited)
+  const match = sql.trim().match(/^call \s*(("\w+"\.)?("(?<delimited>.+)")|(\w+\.)?(?<undelimited>\w+))\s*\(/i)
+  return match && (match.groups.undelimited ?? match.groups.delimited)
 }
 
 function _hdbGetResultForProcedure(rows, args, outParameters) {

package/libx/_runtime/hana/search2cqn4sql.js

@@ -82,6 +82,7 @@ const _addAliasToQuery = (query, entity, columnsToBeSearched) => {
   SELECT.columns = addAliasToExpression(SELECT.columns, getEntityName)
   columnsToBeSearched = addAliasToExpression(columnsToBeSearched, getEntityName)
   SELECT.groupBy = addAliasToExpression(SELECT.groupBy, getEntityName)
+  SELECT.orderBy = addAliasToExpression(SELECT.orderBy, getEntityName)
   SELECT.where = addAliasToExpression(SELECT.where, getEntityName)
   return columnsToBeSearched
 }

package/libx/_runtime/messaging/AMQPWebhookMessaging.js

@@ -38,7 +38,7 @@ class AMQPWebhookMessaging extends MessagingService {
   }
 
   startListening(opt = {}) {
-    if (!this.subscribedTopics.size) return
+    if (!this._listenToAll && !this.subscribedTopics.size) return
     if (!opt.doNotDeploy) {
       const management = this.getManagement()
       this.queued(management.createQueueAndSubscriptions.bind(management))()