@sap/cds 6.1.2 → 6.2.1

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

@@ -11,6 +11,7 @@ const cds = require('../../cds')
 const LOG = cds.log('app')
 const { enrichDataWithKeysFromWhere } = require('../utils/keys')
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
+const propagateForeignKeys = require('../utils/propagateForeignKeys')
 const { checkInputConstraints, assertTargets } = require('../../cds-services/util/assert')
 const getTemplate = require('../utils/template')
 const templateProcessor = require('../utils/templateProcessor')
@@ -126,6 +127,11 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
   const { row, key, element, isRoot } = elementInfo
   category = _getSimpleCategory(category)
 
+  if (category === 'propagateForeignKeys') {
+    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition, { enumerable: false })
+    return
+  }
+
   // remember mandatory
   if (category === 'mandatory') {
     value.mandatory = true
@@ -147,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()
   }
 
@@ -186,6 +192,11 @@ const _pick = element => {
   // collect actions to apply
   const categories = []
 
+  // REVISIT: element._foreignKeys.length seems to be a very broad check
+  if (element.isAssociation && element._foreignKeys.length) {
+    categories.push({ category: 'propagateForeignKeys' })
+  }
+
   if (element['@assert.range'] || element['@assert.enum'] || element['@assert.format']) {
     categories.push('assert')
   }
@@ -237,11 +248,14 @@ 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
 
-  const template = getTemplate('app-input', this, req.target, { pick: _pick })
+  const template = getTemplate('app-input', this, req.target, {
+    pick: _pick,
+    ignore: element => element._isAssociationStrict
+  })
   if (template.elements.size === 0) return
 
   const errors = []
@@ -301,7 +315,8 @@ const _processActionFunctionRow = (row, param, key, errors, event, service) => {
 
   // structured
   const template = getTemplate('app-input-operation', service, param, {
-    pick: _pick
+    pick: _pick,
+    ignore: element => element._isAssociationStrict
   })
 
   if (template && template.elements.size) {
@@ -371,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
@@ -64,7 +64,10 @@ function _handler(req) {
   const { elements } = req.target
   for (const k in req.data) if (k in elements && elements[k]['@Core.MediaType']) return
 
-  const template = getTemplate('app-put', this, req.target, { pick: _pick })
+  const template = getTemplate('app-put', this, req.target, {
+    pick: _pick,
+    ignore: element => element._isAssociationStrict
+  })
   if (template.elements.size === 0) return
 
   // REVISIT: req.data should point into req.query
@@ -84,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)
 })

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

@@ -43,7 +43,7 @@ const _getStaticOrders = req => {
  *
  * @param req
  */
-const _handler = function (req) {
+const commonGenericSorting = function (req) {
   if (!req.query || !req.query.SELECT || req.query.SELECT.one) return
 
   let select = req.query.SELECT
@@ -77,9 +77,9 @@ const _handler = function (req) {
  * handler registration
  */
 module.exports = cds.service.impl(function () {
-  _handler._initial = true
-  this.before('READ', '*', _handler)
+  commonGenericSorting._initial = true
+  this.before('READ', '*', commonGenericSorting)
 })
 
 // REVISIT: remove (currently needed for test)
-module.exports.handler = _handler
+module.exports.handler = commonGenericSorting

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

@@ -1,5 +1,4 @@
 const cds = require('../../cds')
-const LOG = cds.log('app')
 
 const _getDateFromQueryOptions = str => {
   if (str) {
@@ -11,8 +10,6 @@ const _getDateFromQueryOptions = str => {
 
 const _isDate = dateStr => !dateStr.includes(':')
 const _isTimestamp = dateStr => dateStr.includes('.')
-const _isWarningRequired = (warning, queryOptions) =>
-  !warning && queryOptions && (queryOptions['sap-valid-from'] || queryOptions['sap-valid-to'])
 const _isAsOfNow = queryOptions =>
   !queryOptions || (!queryOptions['sap-valid-at'] && !queryOptions['sap-valid-to'] && !queryOptions['sap-valid-from'])
 
@@ -41,7 +38,7 @@ const _getTimeDelta = (target, queryOption) => {
  *
  * @param req
  */
-const _handler = function (req) {
+const commonGenericTemporal = function (req) {
   // REVISIT: public API for query options
   const { _queryOptions } = req
 
@@ -70,7 +67,7 @@ const _handler = function (req) {
  * handler registration
  */
 module.exports = cds.service.impl(function () {
-  _handler._initial = true
+  commonGenericTemporal._initial = true
   // always run to allow interaction with temporal data in custom handlers
-  this.before('*', _handler)
+  this.before('*', commonGenericTemporal)
 })

package/libx/_runtime/common/i18n/messages.properties

@@ -49,10 +49,6 @@ ASSERT_REFERENCE_INTEGRITY=Reference integrity is violated for association "{0}"
 ASSERT_TARGET="Value doesn't exist"
 ASSERT_DEEP_ASSOCIATION=It is not allowed to modify sub documents in {0} Association "{1}"
 
-# persistence
-PERSISTENCE_SKIP_NO_GENERIC_CRUD=Entity "{0}" is annotated with "@sap.persistence.skip" and cannot be served generically.
-NON_WRITABLE_VIEW={0} on views with join and/or union is not supported
-
 # db
 NO_DATABASE_CONNECTION=No database connection
 ENTITY_ALREADY_EXISTS=Entity already exists
@@ -74,9 +70,6 @@ ENTITY_IS_NOT_CRUD=Entity "{0}" is not {1}
 ENTITY_IS_NOT_CRUD_VIA_NAVIGATION=Entity "{0}" is not {1} via navigation "{2}"
 ENTITY_IS_AUTOEXPOSED=Entity "{0}" is not explicitly exposed as part of the service
 EXPAND_IS_RESTRICTED=Navigation property "{0}" is not allowed for expand operation
-EXPAND_COUNT_UNSUPPORTED="/$count" is not supported for expand operation
-ORDERBY_LAMBDA_UNSUPPORTED="$orderby" does not support lambda
-EXPAND_APPLY_UNSUPPORTED="$apply" is not supported for expand operation
 
 # rest protocol adapter
 INVALID_RESOURCE="{0}" is not a valid resource

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

@@ -5,7 +5,7 @@ const { SELECT, INSERT, DELETE, UPDATE } = cds.ql
 const Query = require('../../../../lib/ql/Query')
 
 const { resolveView } = require('./resolveView')
-const { ensureNoDraftsSuffix, getDraftColumnsCQNForDraft } = require('./draft')
+const { ensureNoDraftsSuffix, getDraftColumnsCQNForDraft, ensureDraftsSuffix } = require('./draft')
 const { flattenStructuredSelect, OPERATIONS_MAP } = require('./structured')
 const search2cqn4sql = require('./search2cqn4sql')
 const { getEntityNameFromCQN } = require('./entityFromCqn')
@@ -43,11 +43,11 @@ const convertPathExpressionToWhere = (fromClause, model, options) => {
     return { target, alias, where, cardinality, args }
   }
 
-  let previousSelect, previousEntityName, previousTableAlias, structParent, previousArgs
+  let previousSelect, previousEntityName, previousTableAlias, structParent, previousArgs, draft
   let prefix = []
   let columns
   for (let i = 0; i < fromClause.ref.length; i++) {
-    const entity = structParent || model.definitions[previousEntityName]
+    const entity = structParent || (previousEntityName && model.definitions[ensureNoDraftsSuffix(previousEntityName)])
     const element = _elementFromRef(fromClause.ref[i], entity)
 
     if (element && element._isStructured) {
@@ -55,6 +55,7 @@ const convertPathExpressionToWhere = (fromClause, model, options) => {
       structParent = element
       continue
     } else if (element && element.isAssociation) {
+      if (element._isAssociationStrict && !element['@odata.draft.enclosed']) draft = false
       _modifyNavigationInWhere(fromClause.ref[i].where, element._target)
     } else if (element && previousSelect && i === fromClause.ref.length - 1) {
       columns = [{ ref: [...prefix, element.name] }]
@@ -62,8 +63,10 @@ const convertPathExpressionToWhere = (fromClause, model, options) => {
       continue
     }
 
-    const currentEntityName = _getEntityName(fromClause, entity, i)
+    const entityName = _getEntityName(fromClause, entity, i)
+    const currentEntityName = draft ? entityName && ensureDraftsSuffix(entityName) : entityName
     if (!currentEntityName) continue
+    if (!draft && currentEntityName.endsWith('_drafts')) draft = true
     const tableAlias = `T${i}`
     const currentSelect = SELECT.from(`${currentEntityName} as ${tableAlias}`)
 
@@ -81,7 +84,10 @@ const convertPathExpressionToWhere = (fromClause, model, options) => {
     if (previousSelect) {
       const navigation = _getTargetFromRef(fromClause.ref[i])
       previousSelect.where(
-        model.definitions[previousEntityName]._relations[[...prefix, navigation]].join(tableAlias, previousTableAlias)
+        model.definitions[ensureNoDraftsSuffix(previousEntityName)]._relations[[...prefix, navigation]].join(
+          tableAlias,
+          previousTableAlias
+        )
       )
       _convertSelect(previousSelect, model, options)
       currentSelect.where('exists', previousSelect)
@@ -613,7 +619,6 @@ const _convertPathExpression = (query, model, options = {}) => {
   for (const whereEl of query.SELECT.where || []) {
     if (typeof whereEl === 'object' && whereEl.SELECT) _convertPathExpression(whereEl, model)
   }
-
   const conversion = convertPathExpressionToWhere(query.SELECT.from, model, options)
   if (!conversion) return
   const { target, alias, where, cardinality, columns, args } = conversion

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

@@ -1,8 +1,6 @@
 const cds = require('../../cds')
 const resolveStructured = require('../../common/utils/resolveStructured')
 
-const { ensureNoDraftsSuffix } = require('./draft')
-
 const getEtagElement = entity => {
   return Object.values(entity.elements).find(element => element['@odata.etag'])
 }
@@ -165,31 +163,6 @@ const getElementDeep = (entity, ref) => {
   return current
 }
 
-const isRootEntity = (definitions, entityName) => {
-  const entity = definitions[entityName]
-  if (!entity) return false
-
-  // TODO: There can be unmanaged relations to some parent -> not detected by the following code
-  const associationElements = Object.keys(entity.elements)
-    .map(key => entity.elements[key])
-    .filter(element => element._isAssociationStrict)
-
-  for (const { target } of associationElements) {
-    const parentEntity = definitions[target]
-    for (const parentElementName in parentEntity.elements) {
-      const parentElement = parentEntity.elements[parentElementName]
-      if (
-        parentElement.isComposition &&
-        parentElement.target === entityName &&
-        !(parentElement.parent && ensureNoDraftsSuffix(parentElement.parent.name) === entityName)
-      ) {
-        return false
-      }
-    }
-  }
-  return true
-}
-
 const _setAlias2ref = entity => {
   const _ref2alias = {}
   const _alias2ref = {}
@@ -270,7 +243,6 @@ module.exports = {
   getEtagElement,
   findCsnTargetFor,
   getElementDeep,
-  isRootEntity,
   getDataSubject,
   alias2ref,
   getComp2oneParents,

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

@@ -1,4 +1,5 @@
 const cds = require('../../cds')
+const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _4sqlite = cds.env.i18n && Array.isArray(cds.env.i18n.for_sqlite) ? cds.env.i18n.for_sqlite : []
 // compiler reserves 'localized' and raises a corresponding exception if used in models
@@ -65,10 +66,16 @@ const getDraftColumnsCQNForDraft = () => {
   ]
 }
 
+const filterNonDraftColumns = columns =>
+  columns.filter(
+    col => (col.ref && !(col.ref[col.ref.length - 1] in DRAFT_COLUMNS_MAP)) || (!col.ref && !(col in DRAFT_COLUMNS_MAP))
+  )
+
 module.exports = {
   ensureUnlocalized,
   ensureDraftsSuffix,
   ensureNoDraftsSuffix,
   getDraftColumnsCQNForActive,
-  getDraftColumnsCQNForDraft
+  getDraftColumnsCQNForDraft,
+  filterNonDraftColumns
 }

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

@@ -1,4 +1,5 @@
 const cds = require('../../cds')
+const { ensureNoDraftsSuffix } = require('./draft')
 
 /*
  * returns path like <service>.<entity>:<prop1>.<prop2> for ref = [{ id: '<service>.<entity>' }, '<prop1>', '<prop2>']
@@ -22,7 +23,12 @@ const getEntityFromPath = (path, def) => {
   path = typeof path === 'string' ? cds.parse.path(path) : path
   const segments = [...path.ref]
   while (segments.length) {
-    const segment = segments.shift()
+    let segment = segments.shift()
+    if (segment.id && typeof segment.id === 'string') {
+      segment.id = ensureNoDraftsSuffix(segment.id)
+    } else if (typeof segment === 'string') {
+      segment = ensureNoDraftsSuffix(segment)
+    }
     current = current.elements[segment.id || segment]
     if (current && current.target) current = current._target
   }

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

@@ -0,0 +1,122 @@
+const cds = require('../../cds')
+
+const { prefixForStruct } = require('../../common/utils/csn')
+
+const _autoGenerate = e => e && e.isUUID && e.key
+
+const _set = (row, value, element, enumerable) => {
+  if (!element.parent.elements[element.name]) return // only when in model
+  if (!enumerable && element.foreignKeySource) {
+    // only for foreign keys
+    Object.defineProperty(row, element.name, {
+      get() {
+        return value
+      },
+      set(v) {
+        // Make sure that it becomes enumerable again if set manually afterwards
+        Object.defineProperty(row, element.name, { value: v, configurable: true, enumerable: true })
+      },
+      enumerable: false,
+      configurable: true
+    })
+  } else {
+    row[element.name] = value
+  }
+}
+
+const _generateParentField = ({ parentElement }, row, enumerable) => {
+  if (_autoGenerate(parentElement) && !row[parentElement.name]) {
+    _set(row, cds.utils.uuid(), parentElement, enumerable)
+  }
+}
+
+const _generateChildField = ({ deep, childElement }, childRow, enumerable) => {
+  if (deep) {
+    _generateChildField(deep.propagation, childRow[deep.targetName], enumerable)
+  } else if (_autoGenerate(childElement) && childRow && !childRow[childElement.name]) {
+    _set(childRow, cds.utils.uuid(), childElement, enumerable)
+  }
+}
+
+const _getNestedVal = (row, prefix) => {
+  let val = row
+  const splitted = prefix.split('_')
+  splitted.pop() // remove last `_`
+  let k = ''
+
+  while (splitted.length > 0) {
+    k += splitted.shift()
+    if (k in val) {
+      val = val[k]
+      k = ''
+    } else {
+      k += '_'
+    }
+  }
+
+  return val
+}
+
+const _propagateToChild = ({ parentElement, childElement, parentFieldValue }, row, childRow, enumerable) => {
+  if (!childElement || !childElement.parent.elements[childElement.name]) return
+  if (parentElement) {
+    const prefix = prefixForStruct(parentElement)
+    if (prefix) {
+      const nested = _getNestedVal(row, prefix)
+      _set(childRow, nested[parentElement.name], childElement, enumerable)
+    } else {
+      _set(childRow, row[parentElement.name], childElement, enumerable)
+    }
+  } else if (parentFieldValue !== undefined) {
+    _set(childRow, parentFieldValue, childElement, enumerable)
+  }
+}
+
+const _propagateToParent = ({ parentElement, childElement, deep }, childRow, row, enumerable) => {
+  if (deep) {
+    _propagateToParent(deep.propagation, childRow[deep.targetName], childRow, enumerable)
+  }
+  if (parentElement && childElement && childRow && childElement.name in childRow) {
+    _set(row, childRow[childElement.name], parentElement, enumerable)
+  }
+}
+
+module.exports = (
+  tKey,
+  row,
+  foreignKeyPropagations,
+  isCompositionEffective,
+  { deleteAssocs = false, enumerable = true } = {}
+) => {
+  if (!row || !(tKey in row)) return
+  if (row[tKey] === null) {
+    for (const foreignKeyPropagation of foreignKeyPropagations) {
+      if (!foreignKeyPropagation.fillChild) {
+        _set(row, null, foreignKeyPropagation.parentElement, enumerable)
+      }
+    }
+    if (deleteAssocs && !isCompositionEffective) delete row[tKey]
+    return
+  }
+
+  const childRows = Array.isArray(row[tKey]) ? row[tKey] : [row[tKey]]
+
+  for (const childRow of childRows) {
+    if (!childRow) return
+
+    for (const foreignKeyPropagation of foreignKeyPropagations) {
+      if (foreignKeyPropagation.fillChild) {
+        // propagate or generate in parent
+        const pk = foreignKeyPropagation.parentElement && foreignKeyPropagation.parentElement.name
+        if (pk && !(pk in row)) _propagateToParent(foreignKeyPropagation, childRow, row, enumerable)
+        if (!(pk in row)) _generateParentField(foreignKeyPropagation, row, enumerable)
+
+        if (isCompositionEffective) _propagateToChild(foreignKeyPropagation, row, childRow, enumerable)
+      } else {
+        _generateChildField(foreignKeyPropagation, childRow, enumerable)
+        _propagateToParent(foreignKeyPropagation, childRow, row, enumerable)
+      }
+    }
+  }
+  if (deleteAssocs && !isCompositionEffective) delete row[tKey]
+}

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

@@ -501,9 +501,8 @@ const _checkForForbiddenViews = queryTarget => {
     if (!select.from || select.from.join || select.from.length > 1) {
       throw getError({
         code: 501,
-        message: 'NON_WRITABLE_VIEW',
-        target: queryTarget.name,
-        args: [_event || 'INSERT|UPDATE|DELETE']
+        message: `${_event || 'INSERT|UPDATE|DELETE'} on views with join and/or union is not supported`,
+        target: queryTarget.name
       })
     }
     if (select.where) {

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

@@ -67,7 +67,7 @@ const _getNextTarget = (model, element, currentPath = []) => {
  * @param {object} targetEntity The target entity which needs to be traversed
  * @param {object} callbacks
  * @param {function} callbacks.pick Callback function to pick elements. If it returns a truthy value, the element will be picked. The returned value is part of the template.
- * @param {function} callbacks.ignore Callback function to ignore elements. If it returns a truthy value, the element will be ignored.
+ * @param {function} callbacks.ignore Callback function to ignore the target of an element. If it returns a truthy value, the element's target will be ignored.
  * @param {object} [parent=null] The parent entity
  * @param {Map} [_entityMap] This parameter is an implementation side-effect — don't use it
  * @param {array} [targetPath=[]]
@@ -92,8 +92,6 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
 
   for (const elementName in elements) {
     const element = elements[elementName]
-    if (ignore && ignore(element, targetEntity, parent)) continue
-
     _pick(pick, element, targetEntity, parent, templateElements, elementName)
 
     if (element.items) {
@@ -101,6 +99,7 @@ function _getTemplate(model, cache, targetEntity, callbacks, parent = null, _ent
     }
 
     const { nextTargetName, nextTarget } = _getNextTarget(model, element, currentPath)
+    if (ignore && ignore(element)) continue
     const nextTargetCached = _entityMap.get(nextTargetName)
 
     if (nextTargetCached) {

package/libx/_runtime/db/data-conversion/post-processing.js

@@ -3,55 +3,14 @@ const { ensureNoDraftsSuffix } = require('../../common/utils/draft')
 const { proxifyIfFlattened } = require('../../../common/utils/ucsn')
 const cds = require('../../../../lib')
 
-const _refs = (refs, as) => {
-  const arr = []
-  for (const element of refs) {
-    // multiple join are nested, so we need to find all the table names in there as well
-    if (Object.prototype.hasOwnProperty.call(element, 'join')) {
-      arr.push(..._extractRefs(element))
-      // Likely a union
-    } else if (Object.prototype.hasOwnProperty.call(element, 'SELECT')) {
-      arr.push(..._extractRefs(element.SELECT.from, element.as))
-    } else {
-      arr.push(..._extractRefs(element, as))
-    }
-  }
-
-  return arr
-}
-
-const _getActiveFromUnion = refs => {
-  if (refs.length !== 2) return
-  const [maybeDraft, maybeActive] = refs
-  if (ensureNoDraftsSuffix(maybeDraft.ref[0]) === maybeActive.ref[0]) return maybeActive
-  if (ensureNoDraftsSuffix(maybeActive.ref[0]) === maybeDraft.ref[0]) return maybeDraft
-}
-
-const _extractRefs = (from, as) => {
-  if (from.SELECT) {
-    return _extractRefs(from.SELECT.from, as || from.SELECT.as)
-  }
-  if (Object.prototype.hasOwnProperty.call(from, 'join')) {
-    // cqn with join in from
-    return _refs(from.args)
-  }
-  if (Object.prototype.hasOwnProperty.call(from, 'SET')) {
-    let refs = _refs(from.SET.args).filter(a => !a.as || a.as !== 'filterAdmin')
-    refs = _getActiveFromUnion(refs) ? [_getActiveFromUnion(refs)] : refs
-    if (as) return refs.map(({ ref }) => ({ as, ref }))
-    return refs
-  }
-  if (!from.ref) return []
-  const ref = { ref: [...from.ref] }
-  if (as || from.as) ref.as = as || from.as
-  return [ref]
-}
-
 const _getCastFunction = ({ type }) => {
   switch (type) {
     case 'cds.Boolean':
       return Boolean
     case 'cds.Integer':
+    case 'cds.UInt8':
+    case 'cds.Int16':
+    case 'cds.Int32':
       return Number
     default:
       return String

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

@@ -14,7 +14,7 @@ const cds = require('../../cds')
 const normalizeTimeData = require('../utils/normalizeTimeData')
 
 const { enrichDataWithKeysFromWhere } = require('../../common/utils/keys')
-const propagateForeignKeys = require('../utils/propagateForeignKeys')
+const propagateForeignKeys = require('../../common/utils/propagateForeignKeys')
 const getTemplate = require('../../common/utils/template')
 const templateProcessor = require('../../common/utils/templateProcessor')
 
@@ -32,8 +32,8 @@ const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   category = category.category
 
   // propagate keys
-  if (category === 'propagateForeignKeys' && key in row) {
-    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition)
+  if (category === 'propagateForeignKeys') {
+    propagateForeignKeys(key, row, element._foreignKeys, element.isComposition, { deleteAssocs: true })
     return
   }
 
@@ -197,7 +197,7 @@ const _pickDraft = element => {
   if (categories.length) return { categories }
 }
 
-function _handler(req) {
+function dbGenericInput(req) {
   if (!this.model || typeof req.query === 'string' || !req.target) return
 
   // call with this for this.model
@@ -231,6 +231,6 @@ function _handler(req) {
   }
 }
 
-_handler._initial = true
+dbGenericInput._initial = true
 
-module.exports = _handler
+module.exports = dbGenericInput

package/libx/_runtime/db/sql-builder/dataTypes.js

@@ -3,7 +3,11 @@ const typeConversionMap = new Map()
 typeConversionMap.set('cds.UUID', { type: 'NVARCHAR', length: 36 })
 typeConversionMap.set('cds.Boolean', 'BOOLEAN')
 typeConversionMap.set('cds.Integer', 'INTEGER')
+typeConversionMap.set('cds.UInt8', 'INTEGER')
+typeConversionMap.set('cds.Int16', 'INTEGER')
+typeConversionMap.set('cds.Int32', 'INTEGER')
 typeConversionMap.set('cds.Integer64', 'BIGINT')
+typeConversionMap.set('cds.Int64', 'BIGINT')
 typeConversionMap.set('cds.Decimal', { type: 'DECIMAL' })
 typeConversionMap.set('cds.DecimalFloat', { type: 'DECIMAL' })
 typeConversionMap.set('cds.Double', 'DOUBLE')

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

@@ -106,7 +106,7 @@ const _draftCompositionTree = async (service, req) => {
  *
  * @param req
  */
-const _handler = async function (req) {
+const fioriGenericActivate = async function (req) {
   if (
     isActiveEntityRequested(req.query.SELECT.from.ref[0].where || []) ||
     req.query.SELECT.from.ref.length > 2 ||
@@ -178,5 +178,5 @@ const _handler = async function (req) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('draftActivate', entity, _handler)
+  srv.on('draftActivate', entity, fioriGenericActivate)
 })