@sap/cds 6.3.2 → 6.4.0

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

@@ -18,12 +18,6 @@ const _getEntitySets = (edm, namespace) => {
   return entities
 }
 
-const _getConcurrent = (namespace, element, csn) => {
-  // autoexposed entities now used . in csn and _ in edm
-  const e = findCsnTargetFor(element, csn, namespace)
-  return !!e._etag
-}
-
 const oDataConfiguration = (edm, csn) => {
   let namespace
   for (const prop in edm) {
@@ -44,7 +38,7 @@ const oDataConfiguration = (edm, csn) => {
 
     configuration[entitySet] = {
       maxPageSize: getMaxPageSize(e),
-      isConcurrent: _getConcurrent(namespace, entitySet, csn)
+      isConcurrent: !!e._etag
     }
 
     // custom aggregates

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

@@ -208,6 +208,9 @@ const _processCategory = (req, category, elementInfo, options, previousResult) =
       localizeAfterDraftActivate(row, key, req.locale)
       break
 
+    case '@cds.Boolean':
+      if (row[key] != null) row[key] = !!row[key]
+
     // no default
   }
 }
@@ -270,6 +273,7 @@ const _pick = options => (element, target) => {
 
   if (element['@odata.etag']) categories.push('@odata.etag')
   if (element._type === 'cds.Decimal') categories.push('@cds.Decimal')
+  if (cds.db?.kind === 'better-sqlite' && element._type === 'cds.Boolean') categories.push('@cds.Boolean')
 
   categories.push(..._assocs(element, target))
 

package/libx/_runtime/cds-services/services/Service.js

@@ -50,7 +50,29 @@ class ApplicationService extends cds.Service {
   }
 
   registerFioriHandlers() {
-    return require('../../fiori/generic').impl.call(this)
+    if (cds.env.features.lean_draft) {
+      const {
+        onNewDraft,
+        onDraftPrepare,
+        onDraftActivate,
+        onPatch,
+        onDraftEdit,
+        onDelete
+      } = require('../../fiori/lean-draft')
+      const LOG = cds.log('fiori|drafts')
+
+      for (let each of this.entities)
+        if (each.drafts) {
+          LOG.debug('serving drafts for', { entity: each.name })
+          this.on('NEW', each, onNewDraft)
+          this.on('PATCH', each, onPatch)
+          this.on('EDIT', each, onDraftEdit)
+          this.on('draftPrepare', each, onDraftPrepare)
+          this.on('draftActivate', each, onDraftActivate)
+          this.on('draftActivate', each, onDraftActivate)
+          this.on(['CANCEL', 'DELETE'], each, onDelete)
+        }
+    } else return require('../../fiori/generic').impl.call(this)
   }
 
   registerCrudHandlers() {

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

@@ -259,46 +259,6 @@ const _checkFormatElement = (element, value, errors, key, pathSegments) => {
   }
 }
 
-// check for forbidden deep operations for association
-const checkIfAssocDeep = (element, value, req) => {
-  if (!value) return
-
-  if (element.on) {
-    req.error(
-      assertError(
-        element.is2one
-          ? { code: ASSERT_DEEP_ASSOCIATION, args: ['unmanaged to-one', element.name] }
-          : { code: ASSERT_DEEP_ASSOCIATION, args: ['to-many', element.name] },
-        element,
-        value
-      )
-    )
-
-    return
-  }
-
-  if (element.is2one) {
-    // managed to one
-    Object.keys(value).forEach(prop => {
-      if (typeof value[prop] !== 'object') {
-        const foreignKey = element._foreignKeys.find(fk => fk.childElement.name === prop)
-        if (foreignKey) return
-
-        const key = element.keys.find(element => element.ref[0] === prop)
-        if (key) return
-
-        const err = assertError(
-          { code: ASSERT_DEEP_ASSOCIATION, args: ['managed to-one', element.name] },
-          element,
-          value
-        )
-        err.target += `.${prop}`
-        req.error(err)
-      }
-    })
-  }
-}
-
 /**
  * @param {import('../../types/api').InputConstraints} constraints
  */
@@ -407,7 +367,6 @@ module.exports = {
   checkInputConstraints,
   checkKeys,
   assertError,
-  checkIfAssocDeep,
   checkStaticElementByKey,
   assertNotNullError,
   assertTargets

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

@@ -283,7 +283,11 @@ const _selectDeepUpdateData = async args => {
 
 // if a view has an orderBy with renamed field, we need to resolve it
 const _resolveOrderBy = (orderBy, transitions) => {
-  if (orderBy && transitions.length > 0) orderBy.map(el => (el.ref[0] = transitions[0].mapping.get(el.ref[0]).ref[0]))
+  // no resolved entity found
+  if (!transitions?.length) return
+  // if there are no renamed fields, no need to resolve
+  if (!transitions[0].mapping.size) return
+  if (orderBy) orderBy.map(el => (el.ref[0] = transitions[0].mapping.get(el.ref[0]).ref[0]))
 }
 
 /*

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

@@ -9,9 +9,9 @@ const reject = (req, reason = null) => {
   // unauthorized or forbidden?
   if (req.user._is_anonymous) {
     // REVISIT: challenges handling should be done in protocol adapter (i.e., express error middleware)
-    // REVISIT: improve `req._.req` check if this is an HTTP request
-    if (req._.req && req.user._challenges && req.user._challenges.length > 0) {
-      req._.res.set('WWW-Authenticate', req.user._challenges.join(';'))
+    // REVISIT: improve `req.http.req` check if this is an HTTP request
+    if (req.http?.req && req.user._challenges && req.user._challenges.length > 0) {
+      req.http.res.set('WWW-Authenticate', req.user._challenges.join(';'))
     }
 
     // REVISIT: security log in else case?

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

@@ -16,6 +16,7 @@ const { checkInputConstraints, assertTargets } = require('../../cds-services/uti
 const getTemplate = require('../utils/template')
 const templateProcessor = require('../utils/templateProcessor')
 const { getDataFromCQN, setDataFromCQN } = require('../utils/data')
+const getRowUUIDGeneratorFn = require('../utils/rowUUIDGenerator')
 
 const _shouldSuppressErrorPropagation = (event, value) => {
   return (
@@ -34,24 +35,6 @@ const _getSimpleCategory = category => {
   return category
 }
 
-const _rowKeysGenerator = eventName => {
-  if (eventName === 'UPDATE') return
-  return (keyNames, row, template) => {
-    for (const keyName of keyNames) {
-      if (Object.prototype.hasOwnProperty.call(row, keyName)) {
-        continue
-      }
-
-      const elementInfo = template.elements.get(keyName)
-      const plain = elementInfo && elementInfo.picked && elementInfo.picked.plain
-      if (!plain || !plain.categories) continue
-      if (plain.categories.includes('uuid')) {
-        row[keyName] = cds.utils.uuid()
-      }
-    }
-  }
-}
-
 const _isDraftCoreComputed = (req, element, event) =>
   cds.env.features.preserve_computed !== false &&
   req._ &&
@@ -65,10 +48,7 @@ const _isStreamingProperty = (elements, row, property) =>
   )
 
 const _getMediaTypeValue = req =>
-  req._.req &&
-  req._.req.headers['content-type'] &&
-  !req._.req.headers['content-type'].match(/json|multipart/i) &&
-  req._.req.headers['content-type']
+  !req.http?.req?.headers?.['content-type'].match(/json|multipart/i) && req.http?.req?.headers?.['content-type']
 
 const _preProcessAssertTarget = (assocInfo, assertMap) => {
   const { element: assoc, row } = assocInfo
@@ -265,7 +245,7 @@ async function commonGenericInput(req) {
   }
 
   const pathOptions = {
-    rowKeysGenerator: _rowKeysGenerator(req.event),
+    rowUUIDGenerator: getRowUUIDGeneratorFn(req.event),
     includeKeyValues: true,
     pathSegments: []
   }
@@ -276,7 +256,7 @@ async function commonGenericInput(req) {
     if (pathSegment) pathOptions.pathSegments.push(pathSegment)
 
     if (keys && 'IsActiveEntity' in keys) {
-      pathOptions.extraKeys = { IsActiveEntity: keys.IsActiveEntity }
+      pathOptions.draftKeys = { IsActiveEntity: keys.IsActiveEntity }
     }
   }
 

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

@@ -3,10 +3,10 @@ const { getDefaultPageSize, getMaxPageSize } = require('../utils/page')
 
 const commonGenericPaging = function (req) {
   // only if http request
-  if (!(req.http?.req || req._.req)) return
+  if (!req.http?.req) return
 
   // target === null if view with parameters
-  if (!req.target || !req.query.SELECT || req.query.SELECT.one) return
+  if (!req.target || !req.query?.SELECT || req.query.SELECT.one) return
 
   _addPaging(req.query, req.target)
 }
@@ -17,7 +17,7 @@ const _addPaging = function (query, target) {
   offset = offset && 'val' in offset ? offset.val : 0
   query.limit(...[Math.min(rows, getMaxPageSize(target)), offset])
   //Handle nested limits
-  if (query.SELECT.from.SELECT) _addPaging(query.SELECT.from, target)
+  if (query.SELECT.from.SELECT?.limit) _addPaging(query.SELECT.from, target)
 }
 
 /**

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

@@ -129,21 +129,22 @@ const _findCsnTarget = (edmName, model, namespace) => {
   return target
 }
 
+const _initializeCache = (model, namespace) => {
+  const cache = {}
+  for (const name in model.definitions) {
+    // do no cache entities within different namespace
+    if (!name.startsWith(`${namespace}.`)) continue
+    // cut off namespace and underscoreify entity name (OData does not allow dots)
+    cache[name.replace(new RegExp(`^${namespace}\\.`), '').replace(/\./g, '_')] = model.definitions[name]
+  }
+  return cache
+}
+
 const findCsnTargetFor = (edmName, model, namespace) => {
-  const cache =
-    model._edmToCSNNameMap || Object.defineProperty(model, '_edmToCSNNameMap', { value: {} })._edmToCSNNameMap
-  const edm2csnMap =
-    cache[namespace] ||
-    Object.defineProperty(cache, namespace, {
-      get() {
-        const _ = {}
-        for (const name in model.definitions) {
-          if (!name.startsWith(`${namespace}.`)) continue
-          _[name.replace(new RegExp(`^${namespace}\\.`), '').replace(/\./g, '_')] = model.definitions[name]
-        }
-        return _
-      }
-    })[namespace]
+  const cache = model._edmToCSNNameMap || (model._edmToCSNNameMap = {})
+  const edm2csnMap = cache[namespace] || (cache[namespace] = _initializeCache(model, namespace))
+
+  if (edm2csnMap[edmName]) return edm2csnMap[edmName]
 
   const target = _findCsnTarget(edmName, model, namespace)
 
@@ -226,7 +227,12 @@ function getDraftTreeRoot(entity, model) {
     for (const k in model.definitions) {
       const e = model.definitions[k]
       if (e.kind !== 'entity' || !e.compositions) continue
-      for (const c in e.compositions) if (e.compositions[c].target === current.name) parents.push(e)
+      for (const c in e.compositions)
+        if (
+          e.compositions[c].target === current.name ||
+          e.compositions[c].target === current.name.replace(/\.drafts/, '')
+        )
+          parents.push(e)
     }
     if (parents.length > 1 && parents.some(p => p !== parents[0])) {
       // > unable to determine single parent

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

@@ -19,7 +19,8 @@ const ensureUnlocalized = table => {
   return _table
 }
 
-const ensureDraftsSuffix = name => (name.endsWith('_drafts') ? name : `${ensureUnlocalized(name)}_drafts`)
+const ensureDraftsSuffix = name =>
+  name.endsWith('_drafts') || name.endsWith('.drafts') ? name : `${ensureUnlocalized(name)}_drafts`
 
 const ensureNoDraftsSuffix = name => name.replace(/_drafts$/g, '')
 

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

@@ -319,7 +319,7 @@ const _rewriteQueryPath = (path, transitions) => {
 const _newUpdate = (query, transitions, service) => {
   const targetTransition = transitions[transitions.length - 1]
   const targetName = targetTransition.target.name
-  const newUpdate = { ...query.UPDATE }
+  const newUpdate = Object.create(query.UPDATE)
   newUpdate.entity = newUpdate.entity.ref
     ? {
         ...newUpdate.entity,
@@ -345,7 +345,7 @@ const _newUpdate = (query, transitions, service) => {
 
 const _newSelect = (query, transitions, service) => {
   const targetTransition = transitions[transitions.length - 1]
-  const newSelect = { ...query.SELECT }
+  const newSelect = Object.create(query.SELECT)
   newSelect.from = {
     ...newSelect.from,
     ref: _rewriteQueryPath(query.SELECT.from, transitions)
@@ -379,7 +379,7 @@ const _newSelect = (query, transitions, service) => {
 const _newInsert = (query, transitions, service) => {
   const targetTransition = transitions[transitions.length - 1]
   const targetName = targetTransition.target.name
-  const newInsert = { ...query.INSERT }
+  const newInsert = Object.create(query.INSERT)
   newInsert.into = newInsert.into.ref
     ? {
         ...newInsert.into,
@@ -395,10 +395,29 @@ const _newInsert = (query, transitions, service) => {
   return newInsert
 }
 
+const _newUpsert = (query, transitions, service) => {
+  const targetTransition = transitions[transitions.length - 1]
+  const targetName = targetTransition.target.name
+  const newUpsert = Object.create(query.UPSERT)
+  newUpsert.into = newUpsert.into.ref
+    ? {
+        ...newUpsert.into,
+        ref: _rewriteQueryPath(query.UPSERT.into, transitions)
+      }
+    : targetName
+  if (newUpsert.columns) newUpsert.columns = _newInsertColumns(newUpsert.columns, targetTransition)
+  if (newUpsert.entries) newUpsert.entries = _newEntries(newUpsert.entries, targetTransition, service)
+  Object.defineProperty(newUpsert, '_transitions', {
+    enumerable: false,
+    value: transitions
+  })
+  return newUpsert
+}
+
 const _newDelete = (query, transitions) => {
   const targetTransition = transitions[transitions.length - 1]
   const targetName = targetTransition.target.name
-  const newDelete = { ...query.DELETE }
+  const newDelete = Object.create(query.DELETE)
   newDelete.from = newDelete.from.ref
     ? {
         ...newDelete.from,
@@ -600,6 +619,7 @@ const _newQuery = (query, event, model, service) => {
   const [_prop, _func] = {
     SELECT: ['from', _newSelect],
     INSERT: ['into', _newInsert],
+    UPSERT: ['into', _newUpsert],
     UPDATE: ['entity', _newUpdate],
     DELETE: ['from', _newDelete]
   }[event]
@@ -619,6 +639,7 @@ const resolveView = (query, model, service) => {
   if (query.cmd) _event = query.cmd
   else if (query.SELECT) _event = 'SELECT'
   else if (query.INSERT) _event = 'INSERT'
+  else if (query.UPSERT) _event = 'UPSERT'
   else if (query.UPDATE) _event = 'UPDATE'
   else if (query.DELETE) _event = 'DELETE'
 

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

@@ -2,6 +2,7 @@ const { getNavigationIfStruct } = require('./structured')
 const getColumns = require('../../db/utils/columns')
 const { ensureNoDraftsSuffix, getDraftColumnsCQNForActive } = require('./draft')
 const { getEntityNameFromCQN } = require('./entityFromCqn')
+const cds = require('../../cds')
 
 const isAsteriskColumn = col => col === '*' || (col.ref && col.ref[0] === '*' && !col.expand)
 
@@ -118,7 +119,8 @@ const rewriteAsterisks = (query, model, options) => {
         if (!target) return
 
         query.SELECT.columns = getColumns(target, { _4db }).map(col => ({ ref: [col.name] }))
-        if (_4db && target._isDraftEnabled) query.SELECT.columns.push(..._cqlDraftColumns(target))
+        if (_4db && target._isDraftEnabled && !cds.env.features.lean_draft)
+          query.SELECT.columns.push(..._cqlDraftColumns(target))
       }
     }
 

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

@@ -0,0 +1,21 @@
+const cds = require('../../cds')
+
+const getRowUUIDGeneratorFn = eventName => {
+  if (eventName === 'UPDATE') return
+  return (keyNames, row, template) => {
+    for (const keyName of keyNames) {
+      if (Object.prototype.hasOwnProperty.call(row, keyName)) {
+        continue
+      }
+
+      const elementInfo = template.elements.get(keyName)
+      const plain = elementInfo && elementInfo.picked && elementInfo.picked.plain
+      if (!plain || !plain.categories) continue
+      if (plain.categories.includes('uuid')) {
+        row[keyName] = cds.utils.uuid()
+      }
+    }
+  }
+}
+
+module.exports = getRowUUIDGeneratorFn

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

@@ -1,16 +1,12 @@
 const DELIMITER = require('./templateDelimiter')
-
-const _formatRowContext = (tKey, keyNames, row) => {
-  const keyValuePairs = keyNames.map(key => `${key}=${row[key]}`)
-  const keyValuePairsSerialized = keyValuePairs.join(',')
-  return `${tKey}(${keyValuePairsSerialized})`
-}
+const pathSerializer = require('./templateProcessorPathSerializer')
 
 const _processElement = (processFn, row, key, target, picked = {}, isRoot, pathSegments) => {
   const element = (target.elements || target.params)[key]
   const { plain } = picked
 
   if (!plain) return
+
   /**
    * @type import('../../types/api').templateElementInfo
    */
@@ -19,6 +15,7 @@ const _processElement = (processFn, row, key, target, picked = {}, isRoot, pathS
     elementInfo.pathSegments = pathSegments.slice(0)
     elementInfo.pathSegments.push(...target._flat2struct[key])
   }
+
   processFn(elementInfo)
 }
 
@@ -36,34 +33,34 @@ const _processRow = (processFn, row, template, tKey, tValue, isRoot, pathOptions
 
 const _getTargetKeyNames = target => {
   const keyNames = []
+
   for (const keyName in target.keys) {
     if (target.keys[keyName].__isAssociationStrict) continue
     keyNames.push(keyName)
   }
+
   return keyNames
 }
 
 const _processComplex = (processFn, row, template, key, pathOptions) => {
-  const value = row && row[key]
-  const rows = Array.isArray(value) ? value : [value]
+  const subRow = row?.[key]
+  const rows = Array.isArray(subRow) ? subRow : [subRow]
   if (rows.length === 0) return
-  const keyNames = _getTargetKeyNames(template.target)
+  const keyNames = pathOptions.includeKeyValues && _getTargetKeyNames(template.target)
 
   for (let idx = 0; idx < rows.length; idx++) {
     const row = rows[idx]
     if (row == null) continue
     const args = { processFn, row, template, isRoot: false, pathOptions }
 
-    let rowContext
+    let pathSegment
     if (pathOptions.includeKeyValues) {
-      if (pathOptions.rowKeysGenerator) pathOptions.rowKeysGenerator(keyNames, row, template)
-      rowContext = _formatRowContext(key, keyNames, Object.assign({}, row, pathOptions.extraKeys))
+      if (pathOptions.rowUUIDGenerator) pathOptions.rowUUIDGenerator(keyNames, row, template)
+      pathSegment = pathSerializer(key, keyNames, row, template.target.elements, pathOptions.draftKeys)
     }
 
-    if (pathOptions.pathSegments) pathOptions.pathSegments.push(rowContext || key)
-
+    if (pathOptions.pathSegments) pathOptions.pathSegments.push(pathSegment || key)
     templateProcessor(args)
-
     if (pathOptions.pathSegments) pathOptions.pathSegments.pop()
   }
 }

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

@@ -0,0 +1,23 @@
+const templatePathSerializer = (tKey, keyNames, row, elements, draftKeys) => {
+  const keyValuePairs = keyNames.map(key => {
+    let quote
+
+    switch (elements[key].type) {
+      case 'cds.String':
+        quote = "'"
+        break
+
+      default:
+        quote = ''
+        break
+    }
+
+    const keyValue = row[key] ?? draftKeys?.[key]
+    return `${key}=${quote}${keyValue}${quote}`
+  })
+
+  const keyValuePairsSerialized = keyValuePairs.join(',')
+  return `${tKey}(${keyValuePairsSerialized})`
+}
+
+module.exports = templatePathSerializer

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

@@ -138,6 +138,7 @@ class JoinCQNFromExpanded {
       this._addImplicitOrderBy(readToOneCQN, entity, tableAlias)
       const givenColumns = readToOneCQN.columns
       readToOneCQN.columns = []
+      if (entity['@cds.localized'] === false) defaultLanguage = true
       this._expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage })
     } else {
       const table = unionTable || this._getRef(SELECT).table
@@ -150,6 +151,7 @@ class JoinCQNFromExpanded {
 
       const givenColumns = readToOneCQN.columns
       readToOneCQN.columns = []
+      if (entity['@cds.localized'] === false) defaultLanguage = true
       this._expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage })
     }
 
@@ -491,6 +493,7 @@ class JoinCQNFromExpanded {
    * @param {boolean} arg.defaultLanguage - Use default language for localized fields
    * @private
    */
+  // eslint-disable-next-line complexity
   _expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage }) {
     const toManyColumns = []
     const mappings = this._getMappingObject(toManyTree)
@@ -518,7 +521,8 @@ class JoinCQNFromExpanded {
           entity._isDraftEnabled &&
           navTarget._isAssociationStrict &&
           !navTarget['@odata.draft.enclosed'] &&
-          navTarget.name !== 'DraftAdministrativeData'
+          navTarget.name !== 'DraftAdministrativeData' &&
+          !entity.elements[navProp]._isCompositionBacklink
         ) {
           mappings[navProp] = { [TO_ACTIVE]: true }
         }
@@ -660,7 +664,10 @@ class JoinCQNFromExpanded {
     const activeTableRequired =
       readToOneCQN[IS_UNION_DRAFT] || // > REVISIT: blocks expanding comp2one
       readToOneCQN[IS_ACTIVE] ||
-      (element && element._isAssociationStrict && !element['@odata.draft.enclosed']) ||
+      (element &&
+        element._isAssociationStrict &&
+        !element['@odata.draft.enclosed'] &&
+        !element._isCompositionBacklink) ||
       !this._csn.definitions[target]._isDraftEnabled
 
     const colTarget = target && ensureUnlocalized(target)
@@ -688,7 +695,7 @@ class JoinCQNFromExpanded {
 
     const expandedEntity = this._getEntityForTable(target)
     if (readToOneCQN[IS_UNION_DRAFT] && expandedEntity.drafts) {
-      const cols = column.expand.filter(c => !c.expand && !(c.ref[0] in DRAFT_COLUMNS_MAP)).map(c => c.ref[0])
+      const cols = column.expand.filter(c => c.ref && !c.expand && !(c.ref[0] in DRAFT_COLUMNS_MAP)).map(c => c.ref[0])
       const ks = Object.keys(expandedEntity.keys).filter(
         c => !expandedEntity.keys[c].isAssociation && !(c in DRAFT_COLUMNS_MAP)
       )
@@ -968,6 +975,23 @@ class JoinCQNFromExpanded {
       return column
     }
 
+    if (Array.isArray(column.xpr)) {
+      return this._buildNewAliasColumn(
+        {
+          ...column,
+          xpr: column.xpr.map(x => {
+            if (x.ref) {
+              const res = this._buildNewAliasColumn(x, entity, tableAlias, mappings)
+              delete res.as
+              return res
+            } else return x
+          })
+        },
+        entity,
+        tableAlias,
+        mappings
+      )
+    }
     return this._buildNewAliasColumn(column, entity, tableAlias, mappings)
   }
 
@@ -1146,7 +1170,8 @@ class JoinCQNFromExpanded {
       readToOneCQN[IS_ACTIVE] ||
       (element._isAssociationStrict && !element['@odata.draft.enclosed']) ||
       !this._csn.definitions[colTarget]._isDraftEnabled
-    const ref = this._getJoinRef(entity.elements, colRef[0], expandActive, defaultLanguageThis)
+
+    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)
@@ -1239,14 +1264,6 @@ class JoinCQNFromExpanded {
     return cqn
   }
 
-  _getJoinRef(elements, column, isActive, defaultLanguage) {
-    const assoc = elements[column]
-    if (typeof isActive !== 'boolean' || isActive || !assoc.isComposition) {
-      return defaultLanguage ? ensureUnlocalized(assoc.target) : assoc.target
-    }
-    return assoc.target + '_drafts'
-  }
-
   _isPathExpressionToOne(ref, entity) {
     const ref0 = ref[0]
     const el = entity.elements[ref0]

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

@@ -18,8 +18,6 @@ const propagateForeignKeys = require('../../common/utils/propagateForeignKeys')
 const getTemplate = require('../../common/utils/template')
 const templateProcessor = require('../../common/utils/templateProcessor')
 
-const { checkIfAssocDeep } = require('../../cds-services/util/assert')
-
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _isManaged = (category, event) =>
@@ -85,7 +83,12 @@ const _processCategory = (req, category, { row, key, element }) => {
       if (k.isAssociation || k.name === 'IsActiveEntity') continue
 
       if (!k.isUUID && !(k.name in val)) {
-        req.error(400, 'ASSERT_NOT_NULL', key + '[' + k + ']', [key + '[' + k + ']'])
+        req.error({
+          code: 'MUST_NOT_BE_NULL',
+          message: 'Value is required',
+          target: key + '[' + k + ']',
+          args: [key + '[' + k + ']']
+        })
         return
       }
     }
@@ -93,7 +96,7 @@ const _processCategory = (req, category, { row, key, element }) => {
 
   // not null without default (for better error message)
   if (category === '!default' && val == null && req.event === 'CREATE') {
-    req.error(400, 'ASSERT_NOT_NULL', key, [key])
+    req.error({ code: 'MUST_NOT_BE_NULL', message: 'Value is required', target: key, args: [key] })
     return
   }
 
@@ -101,11 +104,6 @@ const _processCategory = (req, category, { row, key, element }) => {
   if (category === 'uuid' && !val && req.event === 'CREATE') {
     row[key] = cds.utils.uuid()
   }
-
-  // check for forbidden deep operations for association
-  if (category === 'associationEffective' && (req.event === 'CREATE' || req.event === 'UPDATE')) {
-    checkIfAssocDeep(element, val, req)
-  }
 }
 
 const _processorFn = req => elementInfo => {
@@ -152,10 +150,6 @@ const _pickCRUD = element => {
     categories.push({ category: '@cds.on.update', args: element['@cds.on.update'] })
   }
 
-  if (element._isAssociationStrict && !element._target._hasPersistenceSkip) {
-    categories.push('associationEffective')
-  }
-
   // REVISIT: element._foreignKeys.length seems to be a very broad check
   if (element.isAssociation && element._foreignKeys.length) {
     categories.push({ category: 'propagateForeignKeys' })