@sap/cds 5.5.5 → 5.6.0

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

@@ -1,10 +1,7 @@
-const cds = require('../../../../cds')
-
 const {
   Components: { DATA_DELETE_HANDLER, DATA_READ_HANDLER, DATA_CREATE_HANDLER, DATA_UPDATE_HANDLER }
 } = require('../okra/odata-server')
 
-const { getOnCond } = require('../../../../common/utils/generateOnCond')
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 const { isStreaming } = require('./stream')
 const { deepCopyObject, deepCopyArray } = require('../../../../common/utils/copy')
@@ -106,27 +103,6 @@ function _entityOrTypeName(navSourceSegment) {
     .getFullQualifiedName()
 }
 
-const _getNavigationInfoX4 = (navProperty, navSourceSegment, csn) => {
-  const { name, namespace } = _entityOrTypeName(navSourceSegment)
-  const def = findCsnTargetFor(name, csn, namespace)
-
-  const navigationName = navProperty.getName()
-  const navigationDefinition = def.elements[navigationName]
-  return { navigationName, navigationDefinition }
-}
-
-const _getNavigationInfo = (navProperty, navSourceSegment, csn) => {
-  if (cds.env.effective.odata.proxies) {
-    return _getNavigationInfoX4(navProperty, navSourceSegment, csn)
-  }
-
-  const { name, namespace } = _entityOrTypeName(navSourceSegment)
-  const def = findCsnTargetFor(name, csn, namespace)
-  const navigationName = navProperty.getName()
-  const navigationDefinition = def.elements[navigationName]
-  return { navigationName, navigationDefinition }
-}
-
 const _addForeignKeys = (service, req, data) => {
   const pathSegments = req.getUriInfo().getPathSegments()
   // retrieve keys/values from the path segment representing the navigation source
@@ -149,16 +125,9 @@ const _addForeignKeys = (service, req, data) => {
       }
     }
   } else {
-    const { navigationName, navigationDefinition } = _getNavigationInfo(navProperty, navSourceSegment, service.model)
-    const onConditionOptions = {
-      associationNames: navigationName,
-      csn: service.model,
-      aliases: {
-        select: 'target',
-        join: 'source'
-      }
-    }
-    const onCondition = getOnCond(navigationDefinition, onConditionOptions)
+    const { name, namespace } = _entityOrTypeName(navSourceSegment)
+    const def = findCsnTargetFor(name, service.model, namespace)
+    const onCondition = def._relations[navProperty.getName()].join('target', 'source')
     _addKeysToData(navSourceKeyValues, onCondition, data)
   }
 }

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

@@ -23,14 +23,14 @@ const _selectForFunction = (selectColumns, result, opReturnType) => {
 
 const { ensureDraftsSuffix, isDraftActivateAction } = require('../../../../fiori/utils/handler')
 
-const _expand = (model, uriInfo) => {
+const _expand = (model, uriInfo, options) => {
   const expand = uriInfo.getQueryOption(QueryOptions.EXPAND)
 
   if (!expand || expand.length === 0) {
     return []
   }
 
-  return expandToCQN(model, expand, uriInfo.getFinalEdmType())
+  return expandToCQN(model, expand, uriInfo.getFinalEdmType(), options)
 }
 
 const _expandForFunction = async (uriInfo, result, req, srv, opReturnType) => {
@@ -52,7 +52,7 @@ const _expandForFunction = async (uriInfo, result, req, srv, opReturnType) => {
       selectQuery.where(key, '=', row[key])
     }
 
-    const expandCqn = _expand(srv.model, uriInfo)
+    const expandCqn = _expand(srv.model, uriInfo, { rewriteAsterisks: true })
     selectQuery.columns(expandCqn)
 
     const res = await cds.tx(req).run(selectQuery)

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

@@ -2,7 +2,6 @@ const cds = require('../../../../cds')
 const getTemplate = require('../../../../common/utils/template')
 const templateProcessor = require('../../../../common/utils/templateProcessor')
 const { big } = require('@sap/cds-foss')
-const { isBacklink } = require('../../../../common/utils/backlinks')
 const { omitValue, applyOmitValuesPreference } = require('./omitValues')
 
 const METADATA = {
@@ -157,30 +156,28 @@ const _getParent = (model, name) => {
   if (target && target.elements) {
     for (const elementName in target.elements) {
       const element = target.elements[elementName]
-      const assoc = element.target && model.definitions[element.target]
-      if (assoc && element._isAssociationStrict && isBacklink(element, assoc, true)) return assoc
+      if (element._anchor && element._anchor._isContained) return element._anchor
     }
   }
 
   return null
 }
 
-const _isUpAssoc = (element, parent) =>
-  element &&
-  cds.env.effective.odata.containment &&
-  /^up_(_up_)*$/.test(element.name) &&
-  _isContainedOrBackLink(element, parent)
+const _isUpAssoc = element => element && /^up_(_up_)*$/.test(element.name) && _isContainedOrBackLink(element)
 
-const _isContainedOrBackLink = (element, parent) =>
-  element && element.isAssociation && element.keys && (element._isContained || isBacklink(element, parent, true))
+const _isContainedOrBackLink = element =>
+  element &&
+  element.isAssociation &&
+  element.keys &&
+  (element._isContained || (element._anchor && element._anchor._isContained))
 
-const _assocs = (element, target, parent) => {
+const _assocs = (element, target) => {
   const assocName = element['@odata.foreignKey4']
   const assoc = assocName && target.elements[assocName]
 
   if (cds.env.effective.odata.refs) {
     // expand assoc keys except of up_ backlinks
-    if (element['@odata.foreignKey4'] && !_isUpAssoc(assoc, parent)) {
+    if (element['@odata.foreignKey4'] && !_isUpAssoc(assoc)) {
       return ['@odata.foreignKey4']
     }
 
@@ -189,7 +186,7 @@ const _assocs = (element, target, parent) => {
     }
   }
 
-  if (_isContainedOrBackLink(assoc, parent)) {
+  if (_isContainedOrBackLink(assoc)) {
     return ['@cleanup']
   }
 
@@ -201,12 +198,12 @@ const _pick = options => (element, target, parent) => {
 
   if (element['@odata.etag']) categories.push('@odata.etag')
   if (element.type === 'cds.Decimal') categories.push('@cds.Decimal')
-  categories.push(..._assocs(element, target, parent))
+  categories.push(..._assocs(element, target))
   if (options.omitValuesPreference) categories.push('@odata.omitValues')
   if (categories.length) return { categories }
 }
 
-const _getPostProcessOptions = headers => {
+const _getOptions = headers => {
   const options = {
     decimals: null,
     omitValuesPreference: null
@@ -231,14 +228,23 @@ const _getPostProcessOptions = headers => {
   return options
 }
 
+const _generateCacheKey = (headers, options) => {
+  let key = 'postProcess' // default template cache key for post processing
+  if (headers.prefer) key += `:${headers.prefer}`
+  if (options.decimals) key += `:exponentialDecimals=true`
+  return key
+}
+
 const postProcess = (req, res, service, result, previousResult) => {
   const { model } = service
   const { headers, target } = req
 
   if (!target || !result || !model || !model.definitions[target.name]) return
 
-  const options = _getPostProcessOptions(headers)
-  const template = getTemplate('postProcess', service, target, { pick: _pick(options) }, _getParent(model, target.name))
+  const options = _getOptions(headers)
+  const cacheKey = _generateCacheKey(headers, options)
+  const parent = _getParent(model, target.name)
+  const template = getTemplate(cacheKey, service, target, { pick: _pick(options) }, parent)
 
   if (template.elements.size === 0) return
 
@@ -265,7 +271,31 @@ const postProcess = (req, res, service, result, previousResult) => {
   applyOmitValuesPreference(res, options.omitValuesPreference)
 }
 
+const postProcessMinimal = (req, result) => {
+  const { target } = req
+
+  if (!target || !result) return
+
+  const etagElement = Object.values(target.elements).find(el => el['@odata.etag'])
+
+  if (!etagElement) return
+
+  const etag = etagElement.name
+
+  // normalize result to rows
+  result = result.value && Object.keys(result).filter(k => !k.match(/^\W/)).length === 1 ? result.value : result
+  const rows = Array.isArray(result) ? result : [result]
+
+  // process each row
+  for (const row of rows) {
+    if (typeof row !== 'object' || !Object.prototype.hasOwnProperty.call(row, etag)) return
+
+    addEtags(row, etag)
+  }
+}
+
 module.exports = {
   toODataResult,
-  postProcess
+  postProcess,
+  postProcessMinimal
 }

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

@@ -1,7 +1,8 @@
 const cds = require('../../../../cds')
 const { SELECT } = cds.ql
-const { adaptStreamCQN } = require('../../../../fiori/utils/handler')
-const cqn2cqn4sql = require('../../../../common/utils/cqn2cqn4sql')
+const { isActiveEntityRequested } = require('../../../../fiori/utils/where')
+const { ensureDraftsSuffix } = require('../../../../fiori/utils/handler')
+const { cqn2cqn4sql } = require('../../../../common/utils/cqn2cqn4sql')
 const { findCsnTargetFor } = require('../../../../common/utils/csn')
 
 const isStreaming = segments => {
@@ -14,6 +15,8 @@ const isStreaming = segments => {
 }
 
 const _getProperties = async (properties, req) => {
+  const isActiveRequested = isActiveEntityRequested(req.query.SELECT.from.ref[0].where)
+
   // REVISIT DRAFT HANDLING: cqn2cqn4sql should not happen here, but adaptStreamCQN relies on exists clause
   const cqn = cqn2cqn4sql(SELECT.one(req.query.SELECT.from), req._model).columns(properties)
 
@@ -22,7 +25,9 @@ const _getProperties = async (properties, req) => {
     cqn.SELECT.from.ref[0] = req.target.query._target.name
   }
 
-  adaptStreamCQN(cqn)
+  if (!isActiveRequested) {
+    cqn.SELECT.from.ref[0] = ensureDraftsSuffix(cqn.SELECT.from.ref[0])
+  }
 
   try {
     return await cds.tx(req).run(cqn)
@@ -44,7 +49,7 @@ const _getDynamicProperties = (contentType, contentDisposition) => {
 }
 
 const getStreamProperties = async (segments, srv, req) => {
-  // REVISIT: we need to read direcly from db, which might not be there!
+  // REVISIT: we need to read directly from db, which might not be there!
   if (!cds.db) return {}
 
   let contentType, entityName, namespace, contentDisposition
@@ -52,7 +57,7 @@ const getStreamProperties = async (segments, srv, req) => {
   if (previous.getKind() === 'ENTITY') {
     entityName = previous.getEntitySet().getName()
     namespace = previous.getEdmType().getFullQualifiedName().namespace
-  } else if (previous.getKind() === 'NAVIGATION.TO.ONE') {
+  } else if (previous.getKind() === 'NAVIGATION.TO.ONE' && previous.getTarget()) {
     entityName = previous.getTarget().getName()
     namespace = previous.getTarget().getEntityType().getFullQualifiedName().namespace
   }

package/libx/_runtime/cds-services/adapter/rest/handlers/operation.js

@@ -39,7 +39,7 @@ module.exports = service => {
       if (!operation.returns) {
         status = 204
       } else {
-        validateReturnType(req, operation, result)
+        validateReturnType(operation, result)
         bufferToBase64(result, segments[0])
         body = _convertCustomOperationReturnValue(operation.returns, result)
       }

package/libx/_runtime/cds-services/adapter/rest/handlers/update.js

@@ -23,7 +23,7 @@ const _updateThenCreate = async (parsed, restReq, restRes, tx) => {
     req = new RestRequest(parsed, _getData(parsed, restReq), restReq, restRes, tx)
     result = await tx.dispatch(req)
   } catch (e) {
-    if (e.code === 404 && UPSERT_ALLOWED) {
+    if ((e.code === 404 || e.status === 404 || e.statusCode === 404) && UPSERT_ALLOWED) {
       // REVISIT: remove error (and child?) from tx.context? -> would require a unique req.id
 
       parsed.event = 'CREATE'

package/libx/_runtime/cds-services/adapter/rest/rest-to-cqn/index.js

@@ -1,7 +1,5 @@
 const cds = require('../../../../cds')
 
-const { _newReadToCQN } = require('../../../../odata/readToCqn')
-
 const { INSERT, SELECT, UPDATE, DELETE } = cds.ql
 
 const { createCqlString } = require('./utils')
@@ -47,7 +45,7 @@ module.exports = (parsed, data, restReq, service) => {
     case 'CREATE':
       return INSERT.into(target).entries(data)
     case 'READ':
-      return odata2cqn ? _newReadToCQN(service, target, restReq) : _readToCQN(parsed, target, restReq)
+      return odata2cqn ? cds.odata.parse(restReq, { service }) : _readToCQN(parsed, target, restReq)
     case 'UPDATE':
       return UPDATE(createCqlString(target, key, value)).data(data)
     case 'DELETE':

package/libx/_runtime/cds-services/adapter/rest/utils/validation-checks.js

@@ -39,25 +39,18 @@ const validationChecks = (event, data, target) => {
 const _enrichErrorDetails = (isPrimitive, error) => {
   const element = error.target ? ` '${error.target}' ` : ' '
   const typeDetails = isPrimitive ? '.' : ` according to type definition '${error.type}'.`
-  return `Value '${error.value}' of element${element}is invalid${typeDetails}`
+  const value = typeof error.value === 'string' ? `'${error.value}'` : error.value
+  if (element && element.match(/\w/)) return `Value ${value} of element${element}is invalid${typeDetails}`
+  return `Value ${value} is invalid${typeDetails}`
 }
 
 // REVISIT: use i18n
-const _buildErrorMessage = (context, operation, type, typeErrors) => {
-  return `Failed to validate return value ${type ? `of type '${type}' ` : ''}for custom ${operation.kind} '${
-    context.event
+const _getTypeError = (operation, type, errorDetails) => {
+  const typeErrors = errorDetails.map(error => _enrichErrorDetails(cds.builtin.types[type], error))
+  const msg = `Failed to validate return value ${type ? `of type '${type}' ` : ''}for custom ${operation.kind} '${
+    operation.name
   }': ${typeErrors.join(' ')}`
-}
-
-const _getTypeError = (context, operation, type, errorDetails) => {
-  return getError(
-    _buildErrorMessage(
-      context,
-      operation,
-      type,
-      errorDetails.map(error => _enrichErrorDetails(cds.builtin.types[type], error))
-    )
-  )
+  return getError(msg)
 }
 
 const _buildTypeErrorObject = (type, value) => {
@@ -79,14 +72,13 @@ const _checkSingle = (type, check, data) => {
  * Validate the return type values of custom operations (actions and functions) for primitive or complex values as
  * single values or arrays.
  *
- * @param {Context} context
  * @param {Operation} operation
  * @param {object} data
  * @throws Will throw an error with error code 500 if the validation fails. Contains a detailed error message of the
  * type and name of the custom operation, the invalid values, their names and their expected types.
  * @returns {boolean} Returns true if return type validation has passed.
  */
-const validateReturnType = (context, operation, data) => {
+const validateReturnType = (operation, data) => {
   // array of or single return type
   // in case of modeled return type: { type: 'bookModel.Books', _type: csnDefinition }
   // in case of inline return type: { elements: ... } and no explicit name of return type
@@ -118,10 +110,13 @@ const validateReturnType = (context, operation, data) => {
   }
 
   if (checkResult.length !== 0) {
-    throw _getTypeError(context, operation, returnType.type, checkResult)
+    throw _getTypeError(operation, returnType.type, checkResult)
   }
 
   return true
 }
 
-module.exports = { validationChecks, validateReturnType }
+module.exports = {
+  validationChecks,
+  validateReturnType
+}

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

@@ -127,7 +127,12 @@ const computeColumnsToBeSearched = (cqn, entity = { _searchableColumns: [] }) =>
     cqn.SELECT.columns.forEach(column => {
       if (column.func) {
         // exclude $count by SELECT of number of Items in a Collection
-        if (cqn.SELECT.columns.length === 1 && column.func === 'count' && column.as === '_counted_') return
+        if (
+          cqn.SELECT.columns.length === 1 &&
+          column.func === 'count' &&
+          (column.as === '_counted_' || column.as === '$count')
+        )
+          return
         toBeSearched.push(column)
         return
       }

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

@@ -141,15 +141,8 @@ const _addKeysToEntryIfNotExists = (keys, newEntry) => {
   }
 }
 
-const isSelfManaged = element => {
-  if (element.on && element.on.length > 2) {
-    return element.on[0].ref[0] === '$self' || element.on[2].ref[0] === '$self'
-  }
-  return false
-}
-
 const _isUnManaged = element => {
-  return element.on && !isSelfManaged(element)
+  return element.on && !element._isSelfManaged
 }
 
 const _skip = (entity, prop) => entity.elements[prop]._target._hasPersistenceSkip

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

@@ -7,8 +7,9 @@ const { selectDeepUpdateData } = require('../../../common/composition')
 const { ensureDraftsSuffix } = require('../../../fiori/utils/handler')
 
 const { DRAFT_COLUMNS } = require('../../../common/constants/draft')
-const cqn2cqn4sql = require('../../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql, convertPathExpressionToWhere } = require('../../../common/utils/cqn2cqn4sql')
 const { revertData } = require('../../../common/utils/resolveView')
+const { removeIsActiveEntityRecursively } = require('../../../fiori/utils/where')
 
 module.exports = class {
   constructor(srv) {
@@ -32,31 +33,11 @@ module.exports = class {
     return columns
   }
 
-  _createWhereCondition(entity, data) {
-    return Object.keys(entity.keys).reduce((prev, curr) => {
-      if (!DRAFT_COLUMNS.includes(curr)) {
-        prev[curr] = data[curr]
-      }
-
-      return prev
-    }, {})
-  }
-
   _diffDelete(req) {
     const { DELETE } = (req._ && req._.query) || req.query
     const query = SELECT.from(DELETE.from).columns(this._createSelectColumnsForDelete(req.target))
     if (DELETE.where) query.where(...DELETE.where)
 
-    // REVISIT: should be done in cqn2cqn4sql
-    if (req.target._isDraftEnabled && query.SELECT.from.ref.some(r => r.where)) {
-      query.SELECT.from.ref.forEach((r, i) => {
-        if (!r.where) return
-        const j = r.where.findIndex(w => w.ref && w.ref.some(r => r === 'IsActiveEntity'))
-        if (j === -1) return
-        r.where.splice(Math.max(j - 1, 0), 4)
-      })
-    }
-
     return cds
       .tx(req)
       .run(query)
@@ -92,14 +73,14 @@ module.exports = class {
 
   async _diffPatch(req, providedData) {
     if (cds.db) {
+      const { target, alias, where = [] } = convertPathExpressionToWhere(req.query.UPDATE.entity, this._srv.model, {})
+
+      const draftRef = { ref: [ensureDraftsSuffix(target)], as: alias }
+
       // SELECT because req.query in custom handler does not have access to _drafts
       req._.partialPersistentState = await cds
         .tx(req)
-        .run(
-          SELECT.from(ensureDraftsSuffix(req.target.name))
-            .where(this._createWhereCondition(req.target, req.data))
-            .limit(1)
-        )
+        .run(SELECT.from(draftRef).where(removeIsActiveEntityRecursively(where)).limit(1))
 
       return compareJson(providedData || req.data, req._.partialPersistentState, req.target)
     }

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

@@ -2,7 +2,6 @@ const cds = require('../../../cds')
 
 const { SELECT } = cds.ql
 
-const { foreignKeyPropagations } = require('../../../common/utils/foreignKeyPropagations')
 const { checkReferenceIntegrity } = require('../../util/assert')
 const { processDeep, processDeepAsync } = require('../../util/dataProcessUtils')
 
@@ -74,9 +73,8 @@ const _getSelectCQN = (req, columns) => {
 }
 
 function _fillForeignKeysWithNull(managedAssocToOneElement, row) {
-  const keys = foreignKeyPropagations(managedAssocToOneElement)
-  for (const key of keys) {
-    row[key.parentFieldName] = null
+  for (const key of managedAssocToOneElement._foreignKeys) {
+    if (key.parentElement) row[key.parentElement.name] = null
   }
 }
 

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

@@ -1,8 +1,10 @@
+const cds = require('../../cds')
 const { all, resolve } = require('../../common/utils/thenable')
 const { getDependents } = require('../../common/utils/csn')
 
 // REVISIT: replace with cds.Request
 const getEntry = require('../../common/error/entry')
+const crypto = require('crypto')
 
 const ISO_DATE_PART1 =
   '[1-9]\\d{3}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1\\d|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)'
@@ -174,11 +176,12 @@ const checkComplexType = ([key, value], elements, ignoreNonModelledData) => {
   return found || ignoreNonModelledData
 }
 
-const _checkStaticElementByKey = (entity, key, value, result, ignoreNonModelledData) => {
-  const element = entity.elements && entity.elements[key]
+const _checkStaticElementByKey = (definition, key, value, result, ignoreNonModelledData) => {
+  const elementsOrParameters = definition.elements || definition.params
+  const elementOrParameter = elementsOrParameters[key]
 
-  if (!element) {
-    if (!checkComplexType([key, value], entity.elements, ignoreNonModelledData)) {
+  if (!elementOrParameter) {
+    if (!checkComplexType([key, value], elementsOrParameters, ignoreNonModelledData)) {
       result.push(assertError(ASSERT_VALID_ELEMENT, { name: key }))
     }
 
@@ -186,17 +189,17 @@ const _checkStaticElementByKey = (entity, key, value, result, ignoreNonModelledD
   }
 
   let check
-  if (element.type === 'cds.UUID' && entity.name === 'ProvisioningService.tenant') {
+  if (elementOrParameter.type === 'cds.UUID' && definition.name === 'ProvisioningService.tenant') {
     // > old SCP accounts don't have UUID ids
     check = CDS_TYPE_CHECKS['cds.String']
   } else {
-    check = CDS_TYPE_CHECKS[element.type]
+    check = CDS_TYPE_CHECKS[elementOrParameter.type]
   }
 
-  if (check && !check(value, element)) {
+  if (check && !check(value, elementOrParameter)) {
     // code, entity, element, value
-    const args = [typeof value === 'string' ? '"' + value + '"' : value, element.type]
-    result.push(assertError({ code: ASSERT_DATA_TYPE, args }, element, value, key))
+    const args = [typeof value === 'string' ? '"' + value + '"' : value, elementOrParameter.type]
+    result.push(assertError({ code: ASSERT_DATA_TYPE, args }, elementOrParameter, value, key))
   }
 
   return result
@@ -294,14 +297,14 @@ const checkInputConstraints = ({ element, value, errors, key, pathSegments, even
   return errors
 }
 
-const checkStatic = (entity, data, ignoreNonModelledData = false) => {
+const checkStatic = (definition, data, ignoreNonModelledData = false) => {
   if (!Array.isArray(data)) data = [data]
 
   return data.reduce((result, row) => {
     return Object.entries(row)
       .filter(([key, value]) => value !== null && value !== undefined)
       .reduce((result, [key, value]) => {
-        return _checkStaticElementByKey(entity, key, value, result, ignoreNonModelledData)
+        return _checkStaticElementByKey(definition, key, value, result, ignoreNonModelledData)
       }, result)
   }, [])
 }
@@ -320,6 +323,20 @@ const _checkExistsWhere = (entity, whereList, run) => {
       }
     }
 
+    if (cds.context) {
+      const hash = crypto.createHash('sha1').update(JSON.stringify(cqn)).digest('base64') // fastest hash
+      if (!cds.context.__alreadyExecutedIntegrityChecks) cds.context.__alreadyExecutedIntegrityChecks = new Map()
+      if (cds.context.__alreadyExecutedIntegrityChecks.has(hash)) {
+        return cds.context.__alreadyExecutedIntegrityChecks.get(hash)
+      } else {
+        const promise = run(cqn).then(exists => {
+          return exists.length !== 0
+        })
+        // we store the promise object in the map, it won't get executed twice when calling await Promise.all([promise, promise])
+        cds.context.__alreadyExecutedIntegrityChecks.set(hash, promise)
+        return promise
+      }
+    }
     return run(cqn).then(exists => {
       return exists.length !== 0
     })
@@ -553,9 +570,8 @@ const checkKeys = (entity, data) => {
   const entityKeys = Object.keys(entity.keys)
   return data.reduce((result, row) => {
     for (const key of entityKeys) {
-      if (entityKeys.some(key => row[key] === undefined)) {
+      if (row[key] === undefined && entity.elements[key].type !== 'cds.Association')
         result.push(assertError(ASSERT_NOT_NULL, entity.elements[key]))
-      }
     }
     return result
   }, [])

package/libx/_runtime/cds.js

@@ -5,8 +5,9 @@ module.exports = cds
 /*
  * csn aspects
  */
-const { any, entity } = cds.builtin.classes
+const { any, entity, Association } = cds.builtin.classes
 cds.extend(any).with(require('./common/aspects/any'))
+cds.extend(Association).with(require('./common/aspects/Association'))
 cds.extend(entity).with(require('./common/aspects/entity'))
 
 /*

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

@@ -0,0 +1,72 @@
+// global.cds is used on purpose here!
+const cds = global.cds
+
+const ODATA_CONTAINED = '@odata.contained'
+
+const { isSelfManaged, isBacklink, getAnchor, getBacklink } = require('./utils')
+const { foreignKeyPropagations } = require('../utils/foreignKeyPropagations')
+
+module.exports = class {
+  get _isAssociationStrict() {
+    return (
+      this.own('__isAssociationStrict') ||
+      this.set('__isAssociationStrict', !!(this.isAssociation && !this.isComposition))
+    )
+  }
+
+  get _isAssociationEffective() {
+    return (
+      this.own('__isAssociationEffective') ||
+      this.set(
+        '__isAssociationEffective',
+        this._isAssociationStrict && (!this[ODATA_CONTAINED] || this.name === 'DraftAdministrativeData')
+      )
+    )
+  }
+
+  get _isCompositionEffective() {
+    return (
+      this.own('__isCompositionEffective') ||
+      this.set(
+        '__isCompositionEffective',
+        this.isComposition ||
+          (this._isAssociationStrict && this[ODATA_CONTAINED] && this.name !== 'DraftAdministrativeData')
+      )
+    )
+  }
+
+  get _isContained() {
+    return (
+      this.own('__isContained') ||
+      this.set(
+        '__isContained',
+        this.name !== 'DraftAdministrativeData_DraftUUID' &&
+          ((this.isAssociation && this[ODATA_CONTAINED]) || (this.isComposition && cds.env.effective.odata.containment))
+      )
+    )
+  }
+
+  get _isSelfManaged() {
+    return this.own('__isSelfManaged') || this.set('__isSelfManaged', isSelfManaged(this))
+  }
+
+  get _isBacklink() {
+    return this.own('__isBacklink') || this.set('__isBacklink', isBacklink(this))
+  }
+
+  get _isCompositionBacklink() {
+    return this.own('__isCompositionBacklink') || this.set('__isCompositionBacklink', isBacklink(this, true))
+  }
+
+  get _anchor() {
+    return this.own('__anchor') || this.set('__anchor', getAnchor(this))
+  }
+
+  get _backlink() {
+    return this.own('__backlink') || this.set('__backlink', getBacklink(this))
+  }
+
+  get _foreignKeys() {
+    return this.own('__foreignKeys') || this.set('__foreignKeys', foreignKeyPropagations(this))
+  }
+}