@sap/cds 6.1.3 → 6.2.1

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/orderByToCQN.js

@@ -20,7 +20,7 @@ const _orderExpression = order => {
       lastSegment.getKind() === ResourceKind.ANY_EXPRESSION ||
       lastSegment.getKind() === ResourceKind.ALL_EXPRESSION
     ) {
-      throw getError(501, 'ORDERBY_LAMBDA_UNSUPPORTED')
+      throw getError(501, '"$orderby" does not support lambda')
     }
     for (let i = 0; i < order.getExpression().getPathSegments().length; i++) {
       ref.push(_buildNavRef(order.getExpression().getPathSegments()[i]))

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

@@ -2,7 +2,7 @@ const { getFeatureNotSupportedError } = require('../../../util/errors')
 
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 
-const CDL_KEYWORDS = new Set(require('@sap/cds-compiler/lib/base/keywords').cdl)
+const CDL_KEYWORDS = new Set(require('@sap/cds-compiler').to.cdl.keywords)
 
 // TODO: Which EDM Types are missing?
 const notToBeConvertedForCompiler = new Set([

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/ResourcePathParser.js

@@ -334,6 +334,15 @@ class ResourcePathParser {
 
     if (err) throw err
 
+    try {
+      nextTokenizer.requireNext(TokenKind.ODataIdentifier)
+      const uriResources = this._parseBoundOperation(uriPathSegments, currentResource, nextTokenizer)
+      if (uriResources) {
+        return [currentResource].concat(uriResources)
+      }
+    } catch (error) {
+    }
+
     throw new UriSyntaxError(UriSyntaxError.Message.MUST_BE_COUNT_OR_REF_OR_BOUND_OPERATION, uriPathSegments[0])
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriInfo.js

@@ -155,7 +155,11 @@ UriInfo.QueryOptions = {
   SKIP: '$skip',
   TOP: '$top',
   SKIPTOKEN: '$skiptoken',
-  DELTATOKEN: '$deltatoken'
+  DELTATOKEN: '$deltatoken',
+  AT: "$at",
+  TO: "$to",
+  FROM: "$from",
+  TOINCLUSIVE: "$toInclusive"
 }
 
 module.exports = UriInfo

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriParser.js

@@ -102,6 +102,18 @@ queryOptionParserMap.set(QueryOptions.EXPAND, (value, edm, referringType, crossj
   return expandOption
 })
 
+queryOptionParserMap.set(QueryOptions.FROM, (value) => {
+  return value
+})
+queryOptionParserMap.set(QueryOptions.TO, (value) => {
+  return value
+})
+queryOptionParserMap.set(QueryOptions.TOINCLUSIVE, (value) => {
+  return value
+})
+queryOptionParserMap.set(QueryOptions.AT, (value) => {
+  return value
+})
 /**
  * The UriParser is the main class to parse an OData URI.
  */

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/utils/BufferedWriter.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { AsyncResource } = require('node:async_hooks')
 const Transform = require('stream').Transform
 
 /**
@@ -23,14 +24,17 @@ class BufferedWriter extends Transform {
       }
     })
 
-    this.on('finish', () => {
+    // REVISIT: AsyncResource.bind()
+    // We AsyncResource.bind() here (also for non middleware case!) to ensure subsequent handlers have access to cds.context -> this test would break if not, and there's an async handler before ours in the route: cds/tests/_runtime/odata/__tests__/integration/crud-with-mtx.test.js
+    // Yet, if we do so this test breaks because the implementation of srv.on('error') is pretty screwed: cds/tests/runtime/req.test.js
+    this.on('finish', AsyncResource.bind(() => {
       /**
        * Result event to emit the result data.
        * @event BufferedWriter#result
        * @type {Buffer}
        */
       this.emit('result', this.createResultBuffer())
-    })
+    }))
 
     this._internalBufferList = []
   }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/validator/RequestValidator.js

@@ -67,16 +67,36 @@ const queryOptionsPerResourceKindWhiteList = new Map()
     QueryOptions.APPLY,
     QueryOptions.ORDERBY,
     QueryOptions.EXPAND,
-    QueryOptions.SELECT
+    QueryOptions.SELECT,
+    QueryOptions.TO,
+    QueryOptions.AT,
+    QueryOptions.TOINCLUSIVE,
+    QueryOptions.FROM,
   ])
   .set(ResourceKind.ENTITY_COLLECTION + '/' + ResourceKind.COUNT, [
     QueryOptions.APPLY,
     QueryOptions.SEARCH,
     QueryOptions.FILTER
   ])
-  .set(ResourceKind.ENTITY, [QueryOptions.EXPAND, QueryOptions.SELECT, QueryOptions.FORMAT])
+  .set(ResourceKind.ENTITY, [
+    QueryOptions.EXPAND,
+    QueryOptions.SELECT,
+    QueryOptions.FORMAT,
+    QueryOptions.TO,
+    QueryOptions.AT,
+    QueryOptions.TOINCLUSIVE,
+    QueryOptions.FROM
+  ])
   .set(ResourceKind.ENTITY + '/' + ResourceKind.VALUE, [QueryOptions.FORMAT])
-  .set(ResourceKind.SINGLETON, [QueryOptions.EXPAND, QueryOptions.SELECT, QueryOptions.FORMAT])
+  .set(ResourceKind.SINGLETON, [
+    QueryOptions.EXPAND,
+    QueryOptions.SELECT,
+    QueryOptions.FORMAT,
+    QueryOptions.TO,
+    QueryOptions.AT,
+    QueryOptions.TOINCLUSIVE,
+    QueryOptions.FROM
+  ])
   .set(ResourceKind.REF, [QueryOptions.FORMAT])
   .set(ResourceKind.REF_COLLECTION, [
     QueryOptions.SEARCH,
@@ -86,9 +106,21 @@ const queryOptionsPerResourceKindWhiteList = new Map()
     QueryOptions.SKIP,
     QueryOptions.SKIPTOKEN,
     QueryOptions.TOP,
-    QueryOptions.FORMAT
+    QueryOptions.FORMAT,
+    QueryOptions.TO,
+    QueryOptions.AT,
+    QueryOptions.TOINCLUSIVE,
+    QueryOptions.FROM
+  ])
+  .set(ResourceKind.COMPLEX_PROPERTY, [
+    QueryOptions.EXPAND,
+    QueryOptions.SELECT,
+    QueryOptions.FORMAT,
+    QueryOptions.TO,
+    QueryOptions.AT,
+    QueryOptions.TOINCLUSIVE,
+    QueryOptions.FROM,
   ])
-  .set(ResourceKind.COMPLEX_PROPERTY, [QueryOptions.EXPAND, QueryOptions.SELECT, QueryOptions.FORMAT])
   .set(ResourceKind.COMPLEX_COLLECTION_PROPERTY, [
     QueryOptions.APPLY,
     QueryOptions.FILTER,
@@ -99,7 +131,11 @@ const queryOptionsPerResourceKindWhiteList = new Map()
     QueryOptions.TOP,
     QueryOptions.EXPAND,
     QueryOptions.SELECT,
-    QueryOptions.FORMAT
+    QueryOptions.FORMAT,
+    QueryOptions.TO,
+    QueryOptions.AT,
+    QueryOptions.TOINCLUSIVE,
+    QueryOptions.FROM,
   ])
   .set(ResourceKind.COMPLEX_COLLECTION_PROPERTY + '/' + ResourceKind.COUNT, [QueryOptions.APPLY, QueryOptions.FILTER])
   .set(ResourceKind.PRIMITIVE_PROPERTY, [QueryOptions.FORMAT])
@@ -110,7 +146,11 @@ const queryOptionsPerResourceKindWhiteList = new Map()
     QueryOptions.SKIP,
     QueryOptions.SKIPTOKEN,
     QueryOptions.TOP,
-    QueryOptions.FORMAT
+    QueryOptions.FORMAT,
+    QueryOptions.TO,
+    QueryOptions.AT,
+    QueryOptions.TOINCLUSIVE,
+    QueryOptions.FROM
   ])
   .set(ResourceKind.PRIMITIVE_COLLECTION_PROPERTY + '/' + ResourceKind.COUNT, [QueryOptions.FILTER])
   .set(ResourceKind.PRIMITIVE_PROPERTY + '/' + ResourceKind.VALUE, [QueryOptions.FORMAT])

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

@@ -26,7 +26,7 @@ if (cds.mtx || cds.requires.extensibility || cds.requires.toggles)
     const id = `${++unique} - ${srv.path}` // REVISIT: this is to allow running multiple express apps serving same endpoints, as done by some questionable tests
     return function ODataAdapter(req, res) {
       const model = cds.context?.model || srv.model
-      if (!model._cached) Object.defineProperty(model, '_cached', { value: {} })
+      if (!model._cached) Object.defineProperty(model, '_cached', { value: { touched: Date.now() } })
 
       // Note: cache is attached to model cache so they get disposed when models are evicted from cache
       let adapters = model._cached._odata_adapters || (model._cached._odata_adapters = {})

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

@@ -147,7 +147,11 @@ const CDS_TYPE_CHECKS = {
   'cds.UUID': _checkUUID,
   'cds.Boolean': _checkBoolean,
   'cds.Integer': _checkInteger,
+  'cds.UInt8': _checkInteger,
+  'cds.Int16': _checkInteger,
+  'cds.Int32': _checkInteger,
   'cds.Integer64': _checkInteger,
+  'cds.Int64': _checkInteger,
   'cds.Decimal': _checkDecimal,
   'cds.DecimalFloat': _checkNumber,
   'cds.Double': _checkNumber,

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

@@ -23,7 +23,7 @@ module.exports = class Relation {
   }
 
   _has(prop) {
-    return Reflect.has(this, prop) && !this._elements[prop]
+    return Reflect.has(this, prop)
   }
 
   get _elements() {

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

@@ -123,21 +123,40 @@ const _subData = (data, prop) =>
     return result
   }, [])
 
+const _getWhereObj = (row, links) => {
+  return links.reduce((res, currentLink) => {
+    if (Object.prototype.hasOwnProperty.call(row, currentLink.targetKey) && row[currentLink.targetKey] !== null)
+      res[currentLink.entityKey] = row[currentLink.targetKey]
+    return res
+  }, {})
+}
+
 const _subWhere = (result, element) => {
   let where
   const links = [...element.backLinks, ...element.customBackLinks]
-  if (links && links.length > 0) {
-    where = []
-    for (const row of result) {
-      const whereObj = links.reduce((res, currentLink) => {
-        if (Object.prototype.hasOwnProperty.call(row, currentLink.targetKey) && row[currentLink.targetKey] !== null)
-          res[currentLink.entityKey] = row[currentLink.targetKey]
-        return res
-      }, {})
-      const whereCQN = ctUtils.whereKey(whereObj)
-      if (whereCQN.length) {
-        if (where.length > 0) where.push('or')
-        where.push({ xpr: [...whereCQN] })
+  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) {
+      const keys = { list: keys0.map(pk => ({ ref: [pk] })) }
+      for (let i = 0; i < result.length; i += chunkSize) {
+        const values = {
+          list: result
+            .slice(i, i + chunkSize)
+            .map(row => ({ list: keys0.map(k => ({ val: _getWhereObj(row, links)[k] || null })) }))
+        }
+        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] })
+        }
       }
     }
   }
@@ -214,8 +233,36 @@ const _select = ({
 
 const _selectDeepUpdateData = async args => {
   const { model, compositionTree, entityName, data, root, selectData, tx, selectAllColumns } = args
-  const selectCQN = _select(args)
-  const result = await tx.run(selectCQN)
+  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])
+    const keys = { list: keys0.map(pk => ({ ref: [pk] })) }
+    for (let i = 0; i < args.parentKeys.length; i += chunkSize) {
+      const values = {
+        list: args.parentKeys.slice(i, i + chunkSize).map(row => ({ list: keys0.map(k => ({ val: row[k] || null })) }))
+      }
+      const _args = { ...args, where: [keys, 'in', values] }
+      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 }
+      const selectCQN = _select(_args)
+      result.push(...(await tx.run(selectCQN)))
+    }
+  } else {
+    const selectCQN = _select(args)
+    result = await tx.run(selectCQN)
+  }
+
   if (!result.length) return Promise.resolve(result)
 
   const keys = _keys(model.definitions[entityName], result)
@@ -274,7 +321,6 @@ const selectDeepUpdateData = (service, model, req, selectAllColumns = false) =>
   const compositionTree = getCompositionTree({
     definitions: model.definitions,
     rootEntityName: entityName, // REVISIT: drafts are resolved too eagerly
-    checkRoot: false,
     resolveViews: !draft,
     service
   })

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

@@ -291,7 +291,6 @@ const getDeepDeleteCQNs = async (model, req, dbQuery) => {
   const compositionTree = getCompositionTree({
     definitions: model.definitions,
     rootEntityName: entityName,
-    checkRoot: false,
     resolveViews: !draft,
     service: cds.db
   })

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

@@ -84,7 +84,6 @@ const getDeepInsertCQNs = (model, cqn) => {
   const compositionTree = getCompositionTree({
     definitions: model.definitions,
     rootEntityName: entityName,
-    checkRoot: false,
     resolveViews: !draft,
     service: cds.db
   })

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

@@ -1,10 +1,8 @@
 const cds = require('../../cds')
 
 const { ensureNoDraftsSuffix } = require('../utils/draft')
-const { isRootEntity } = require('../utils/csn')
 const { getTransition, getDBTable } = require('../utils/resolveView')
 
-const getError = require('../../common/error')
 const { prefixForStruct } = require('../../common/utils/csn')
 
 /*
@@ -186,12 +184,9 @@ const _removeLocalizedTextsFromDraftTree = (compositionTree, definitions, checke
   }
 }
 
-const _getCompositionTree = ({ definitions, rootEntityName, checkRoot = true, resolveViews = false, service }) => {
+const _getCompositionTree = ({ definitions, rootEntityName, resolveViews = false, service }) => {
   const rootName = resolveViews ? _resolvedEntityName(rootEntityName, definitions) : rootEntityName
 
-  if (checkRoot && !isRootEntity(definitions, rootEntityName)) {
-    throw getError(400, `Entity "${rootEntityName}" is not root entity`)
-  }
   const compositionTree = {}
   _getCompositionTreeRec({
     rootEntityName: rootName,
@@ -238,8 +233,8 @@ const _cacheCompositionParentsOfOne = ({ definitions }) => {
 
 const _memoizeGetCompositionTree = fn => {
   const cache = new Map()
-  return ({ definitions, rootEntityName, checkRoot = true, resolveViews = false, service }) => {
-    const key = [rootEntityName, checkRoot].join('#')
+  return ({ definitions, rootEntityName, resolveViews = false, service }) => {
+    const key = rootEntityName
 
     // use ApplicationService as cache key for extensibility
     // REVISIT: context._tx is not a stable API -> pls do not rely on that
@@ -249,7 +244,7 @@ const _memoizeGetCompositionTree = fn => {
     const cachedResult = map && map.get(key)
     if (cachedResult) return cachedResult
     _cacheCompositionParentsOfOne({ definitions })
-    const compTree = fn({ definitions, rootEntityName, checkRoot, resolveViews, service })
+    const compTree = fn({ definitions, rootEntityName, resolveViews, service })
 
     const _map = map || new Map()
     _map.set(key, compTree)
@@ -289,7 +284,6 @@ const getCompositionRoot = (definitions, entity) => {
  *
  * @param {object} definitions Definitions of the reflected model
  * @param {string} rootEntityName Name of the root entity
- * @param {boolean} checkRoot Check is provided entity is a root
  * @returns {object} tree of all compositions
  * @throws Error if no valid root entity provided
  */

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

@@ -34,17 +34,39 @@ const _dataByKey = (entity, data) => {
   return dataByKey
 }
 
-function _addSubDeepUpdateCQNForDelete({ entity, data, selectData, deleteCQN }) {
+function _addSubDeepUpdateCQNForDelete({ entity, data, selectData, entityName, deleteCQNs }) {
+  const chunkSize = cds.env.features.chunk_deep
   const dataByKey = _dataByKey(entity, data)
-  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')
+  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) {
+      const deleteCQN = { DELETE: { from: entityName, where: [] } }
+      for (let i = j; i < j + chunkSize; i++) {
+        const selectEntry = selectData[i]
+        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))] })
+        }
+      }
+      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))] })
       }
-      deleteCQN.DELETE.where.push({ xpr: [...ctUtils.whereKey(ctUtils.key(entity, selectEntry))] })
     }
+    deleteCQNs.push(deleteCQN)
   }
 }
 
@@ -131,7 +153,7 @@ function _addSubDeepUpdateCQNForUpdateInsert({ entity, entityName, data, selectD
   return deepUpdateData
 }
 
-async function _addSubDeepUpdateCQNCollect(model, cqns, updateCQNs, insertCQN, deleteCQN, req) {
+async function _addSubDeepUpdateCQNCollect(model, cqns, updateCQNs, insertCQN, deleteCQNs, req) {
   if (updateCQNs.length > 0) {
     cqns[0] = cqns[0] || []
     cqns[0].push(...updateCQNs)
@@ -152,15 +174,17 @@ async function _addSubDeepUpdateCQNCollect(model, cqns, updateCQNs, insertCQN, d
     })
   }
 
-  if (deleteCQN.DELETE.where.length > 0) {
-    cqns[0] = cqns[0] || []
-    const deepDeleteCQNs = await getDeepDeleteCQNs(model, req, deleteCQN)
-    deepDeleteCQNs.forEach((deleteCQNs, index) => {
-      deleteCQNs.forEach(el => {
-        cqns[index] = cqns[index] || []
-        cqns[index].push(el)
+  for (let deleteCQN of deleteCQNs) {
+    if (deleteCQN.DELETE.where.length > 0) {
+      cqns[0] = cqns[0] || []
+      const deepDeleteCQNs = await getDeepDeleteCQNs(model, req, deleteCQN)
+      deepDeleteCQNs.forEach((delCQNs, index) => {
+        delCQNs.forEach(el => {
+          cqns[index] = cqns[index] || []
+          cqns[index].push(el)
+        })
       })
-    })
+    }
   }
 }
 
@@ -219,8 +243,8 @@ const _addSubDeepUpdateCQN = async ({ model, compositionTree, data, selectData,
   const entityName = ctUtils.addDraftSuffix(draft, entity.name)
   const updateCQNs = []
   const insertCQN = { INSERT: { into: entityName, entries: [] } }
-  const deleteCQN = { DELETE: { from: entityName, where: [] } }
-  _addSubDeepUpdateCQNForDelete({ entity, data, selectData, deleteCQN })
+  const deleteCQNs = []
+  _addSubDeepUpdateCQNForDelete({ entity, data, selectData, entityName, deleteCQNs })
   const deepUpdateData = _addSubDeepUpdateCQNForUpdateInsert({
     entity,
     entityName,
@@ -231,7 +255,7 @@ const _addSubDeepUpdateCQN = async ({ model, compositionTree, data, selectData,
     model
   })
 
-  await _addSubDeepUpdateCQNCollect(model, cqns, updateCQNs, insertCQN, deleteCQN, req)
+  await _addSubDeepUpdateCQNCollect(model, cqns, updateCQNs, insertCQN, deleteCQNs, req)
 
   if (deepUpdateData.length === 0) return Promise.resolve()
 
@@ -287,7 +311,6 @@ const getDeepUpdateCQNs = async (model, req, selectData) => {
   const compositionTree = getCompositionTree({
     definitions: model.definitions,
     rootEntityName: entityName,
-    checkRoot: false,
     resolveViews: !draft,
     service: cds.db
   })

package/libx/_runtime/common/generic/auth/capabilities.js

@@ -10,16 +10,14 @@ const _isRestricted = (req, capability, capabilityReadByKey) => {
 
 const _isNavigationRestricted = (target, path, annotation, req) => {
   if (!target) return
-  const parts = annotation.split('.')
-  if (target && Array.isArray(target['@Capabilities.NavigationRestrictions.RestrictedProperties'])) {
-    for (const r of target['@Capabilities.NavigationRestrictions.RestrictedProperties']) {
-      if (r.NavigationProperty['='] === path && r[parts[0]]) {
-        return _isRestricted(
-          req,
-          r[parts[0]][parts[1]],
-          r.ReadRestrictions && r.ReadRestrictions['ReadByKeyRestrictions.Readable']
-        )
-      }
+  if (!Array.isArray(target['@Capabilities.NavigationRestrictions.RestrictedProperties'])) return
+
+  const [restriction, operation] = annotation.split('.')
+  for (const r of target['@Capabilities.NavigationRestrictions.RestrictedProperties']) {
+    // prefix check to support both notations: { InsertRestrictions: { Insertable: false } } and { InsertRestrictions.Insertable: false }
+    if (r.NavigationProperty['='] === path && Object.keys(r).some(k => k.startsWith(restriction))) {
+      const capability = r[annotation] ?? r[restriction]?.[operation]
+      return _isRestricted(req, capability, r.ReadRestrictions?.['ReadByKeyRestrictions.Readable'])
     }
   }
 }

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

@@ -30,8 +30,7 @@ exports.impl = cds.service.impl(function () {
     if (typeof req.query !== 'string' && req.target && req.target._hasPersistenceSkip) {
       throw getError({
         code: 501,
-        message: 'PERSISTENCE_SKIP_NO_GENERIC_CRUD',
-        args: [req.target.name]
+        message: `Entity "${req.target.name}" is annotated with "@cds.persistence.skip" and cannot be served generically.`
       })
     }
 

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

@@ -69,7 +69,7 @@ const _isConcurrentODataReq = req => {
  *
  * @param req
  */
-const _handler = async function (req) {
+const commonGenericEtag = async function (req) {
   // REVISIT: The check for ODataRequest should be removed after etag logic is moved
   // from okra to commons and etag handling is also allowed for rest.
 
@@ -104,7 +104,7 @@ const _handler = async function (req) {
  */
 /* istanbul ignore next */
 module.exports = cds.service.impl(function () {
-  _handler._initial = true
+  commonGenericEtag._initial = true
 
   for (const k in this.entities) {
     const entity = this.entities[k]
@@ -119,10 +119,10 @@ module.exports = cds.service.impl(function () {
       events = ['READ', 'NEW', 'DELETE', 'PATCH', 'EDIT', 'CANCEL']
     }
 
-    this.before(events, entity, _handler)
+    this.before(events, entity, commonGenericEtag)
 
     for (const action in entity.actions) {
-      this.before(action, entity, _handler)
+      this.before(action, entity, commonGenericEtag)
     }
   }
 })

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

@@ -153,7 +153,7 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
   }
 
   // generate UUIDs
-  if (category === 'uuid' && !value.val && (event !== 'UPDATE' || !isRoot)) {
+  if (category === 'uuid' && !value.val && ((event !== 'UPDATE' && event !== 'PATCH') || !isRoot)) {
     value.val = row[key] = cds.utils.uuid()
   }
 
@@ -248,7 +248,7 @@ const _getBoundActionBindingParameter = req => {
   return (actions && actions[action] && actions[action]['@cds.odata.bindingparameter.name']) || 'in'
 }
 
-async function _handler(req) {
+async function commonGenericInput(req) {
   if (!req.query) return // FIXME: the code below expects req.query to be defined
   if (!req.target) return
 
@@ -386,11 +386,11 @@ function _actionFunctionHandler(req) {
   _callError(req, errors)
 }
 
-_handler._initial = true
+commonGenericInput._initial = true
 _actionFunctionHandler._initial = true
 
 module.exports = cds.service.impl(function () {
-  this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', _handler)
+  this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', commonGenericInput)
   const operationNames = []
 
   for (const operation of this.operations) {

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

@@ -1,7 +1,7 @@
 const cds = require('../../cds')
 const { getDefaultPageSize, getMaxPageSize } = require('../utils/page')
 
-const _handler = function (req) {
+const commonGenericPaging = function (req) {
   // only if http request
   if (!req._.req) return
 
@@ -24,6 +24,6 @@ const _addPaging = function (query, target) {
  * handler registration
  */
 module.exports = cds.service.impl(function () {
-  _handler._initial = true
-  this.before('READ', '*', _handler)
+  commonGenericPaging._initial = true
+  this.before('READ', '*', commonGenericPaging)
 })

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

@@ -55,7 +55,7 @@ const _pick = element => {
   }
 }
 
-function _handler(req) {
+function commonGenericPut(req) {
   if (req.method !== 'PUT') return
   if (!req.query) return // FIXME: the code below expects req.query to be defined
   if (!req.target) return
@@ -87,8 +87,8 @@ function _handler(req) {
   setDataFromCQN(req)
 }
 
-_handler._initial = true
+commonGenericPut._initial = true
 
 module.exports = cds.service.impl(function () {
-  this.before(['UPDATE'], '*', _handler)
+  this.before(['UPDATE'], '*', commonGenericPut)
 })