@sap/cds 7.9.2 → 8.0.3

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

@@ -89,7 +89,6 @@ const _preProcessAssertTarget = (assocInfo, assertMap) => {
   })
 }
 
-// eslint-disable-next-line complexity
 const _processCategory = (req, category, value, elementInfo, assertMap) => {
   const { row, key, element, isRoot } = elementInfo
   category = _getSimpleCategory(category)
@@ -113,12 +112,8 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
     const managed = `@cds.on.${event === 'CREATE' ? 'insert' : 'update'}`
     if (cds.env.features.preserve_computed !== false && req._?.event === 'draftActivate' && !element[managed]) return
 
-    // FIXME: req.context?.event not available with new odata adapter
-    // Always take over the values from active entities
-    if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
-
     // read-only values are already deleted before `NEW` (and they can be set in a `NEW` handler!)
-    if (cds.env.fiori?.lean_draft && event === 'CREATE' && req.target.isDraft) return
+    if (event === 'CREATE' && req.target.isDraft) return
 
     delete row[key]
     value.val = undefined
@@ -126,11 +121,9 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
   }
 
   // remove immutable (can also be complex, so do first)
-  if (category === 'immutable' && event === 'UPDATE') {
-    // FIXME: req.context?.event not available with new odata adapter
-    // Always take over the values from active entities
-    if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
-
+  // for new db drivers (cds.db.cqn2sql is defined), deep immutable values are handled in differ
+  // otherwise they're not supported and always filtered out here.
+  if (category === 'immutable' && event === 'UPDATE' && (isRoot || !cds.db.cqn2sql)) {
     delete row[key]
     value.val = undefined
     return
@@ -181,28 +174,25 @@ const _pick = element => {
     categories.push({ category: 'propagateForeignKeys' })
   }
 
-  if (!cds.env.features.cds_assert) {
-    if (
-      element['@assert.range'] ||
-      element['@assert.enum'] ||
-      element['@assert.format'] ||
-      element.type === 'cds.Decimal'
-    ) {
+  // some checks are not needed if cds_validate is active (the default in cds^8)
+  if (!cds.env.features.cds_validate) {
+    if (element['@assert.range'] || element['@assert.format'] || element.type === 'cds.Decimal') {
       categories.push('assert')
     }
 
     if (element._isMandatory) {
       categories.push('mandatory')
     }
-  }
-
-  // TODO: can we move more checks to cds.assert()?
 
-  if (element._isReadOnly) {
-    // > _isReadOnly includes @cds.on.insert and @cds.on.update
-    categories.push('readonly')
+    if (element._isReadOnly) {
+      // > _isReadOnly includes @cds.on.insert and @cds.on.update
+      categories.push('readonly')
+    }
   }
 
+  // REVISIT: cleanse @Core.Immutable
+  //          should be a db feature, as we cannot handle completely on service level (cf. deep update)
+  //          -> add to attic env behavior once new dbs handle this
   if (element['@Core.Immutable']) {
     categories.push('immutable')
   }
@@ -211,7 +201,9 @@ const _pick = element => {
     categories.push('uuid')
   }
 
-  if (element['@Core.IsMediaType']) categories.push('stream')
+  if (element['@Core.IsMediaType']) {
+    categories.push('stream')
+  }
 
   if (
     element._isAssociationStrict &&
@@ -225,12 +217,7 @@ const _pick = element => {
   if (categories.length) return { categories }
 }
 
-const _callError = (req, errors) => {
-  if (errors.length === 0) return
-  for (const error of errors) req.error(error)
-}
-
-// FIXME: req.context?.event not available with new odata adapter
+// REVISIT: needed only for draftActivate with old adapter -> remove with okra
 const _getBoundAction = req => req.target.actions?.[req._?.event || req.context?.event]
 const _getBoundActionBindingParameter = action => action['@cds.odata.bindingparameter.name'] || 'in'
 
@@ -238,6 +225,25 @@ async function commonGenericInput(req) {
   if (!req.query) return // FIXME: the code below expects req.query to be defined
   if (!req.target) return
 
+  // validate data
+  if (cds.env.features.cds_validate) {
+    const assertOptions = { mandatories: req.event === 'CREATE' || req.req?.method === 'PUT' }
+
+    const _is_activate = req._?.event === 'draftActivate' && cds.env.features.preserve_computed !== false
+    const _is_create_after_new = req.target.isDraft && req.event === 'CREATE'
+    if (_is_activate || _is_create_after_new) assertOptions.cleanse = false
+
+    // REVISIT: initialize path if necessary (currently only done in lean-draft -> correct?)
+    const bound = req.target.actions?.[req.event] || req.target.actions?.[req._.event]
+    if (bound) assertOptions.path = [bound['@cds.odata.bindingparameter.name'] || 'in']
+
+    const errs = cds.validate(req.data, req.target, assertOptions)
+    if (errs) {
+      if (errs.length === 1) throw errs[0]
+      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
+    }
+  }
+
   const template = getTemplate('app-input', this, req.target, {
     pick: _pick,
     ignore: element => element._isAssociationStrict
@@ -256,6 +262,7 @@ async function commonGenericInput(req) {
     pathSegmentsInfo: []
   }
 
+  // REVISIT: needed only for correct error target in case of draftActivate with old adapter -> remove with okra
   const boundAction = _getBoundAction(req)
 
   if (boundAction) {
@@ -280,7 +287,8 @@ async function commonGenericInput(req) {
   }
 
   setDataFromCQN(req) // REVISIT: req.data should point into req.query
-  _callError(req, errors)
+
+  if (errors.length) for (const error of errors) req.error(error)
 }
 
 const _getProcessorFnForActionsFunctions =
@@ -325,63 +333,54 @@ const _processActionFunction = (row, eventParams, errors, event, service) => {
   }
 }
 
-const _getEventParameters = (req, service) => {
+const _getOperation = (req, service) => {
   // in bound case
   if (req.target) {
     if (req.target.actions && req.target.actions[req.event]) {
-      return req.target.actions[req.event].params
+      return req.target.actions[req.event]
     }
 
-    return req.target.functions[req.event].params
+    return req.target.functions[req.event]
   }
 
   // in unbound case
-  return service.model.definitions[`${service.name}.${req.event}`].params
+  return service.model.definitions[`${service.definition.name}.${req.event}`]
 }
 
 function _actionFunctionHandler(req) {
-  const eventParams = _getEventParameters(req, this)
-  if (!eventParams) return
-
-  // REVISIT: find better solution -> this obviously was because params were not linked in the past
-  // attach aspects, if not yet done
-  // for (const param of Object.values(eventParams)) {
-  //   if ('_isMandatory' in param) continue
-  //   param._isMandatory = isMandatory(param)
-  //   param._isReadOnly = isReadOnly(param)
-  // }
-
-  // REVISIT: find better solution, maybe compiler? -> this obviously was because params were not linked in the past
-  // resolve enums like format, range, etc.
-  // for (const param of Object.values(eventParams)) {
-  //   // .type of action/function behaves different to .type of other csn elements
-  //   const _type = param.type && this.model && this.model.definitions[param.type]
-  //
-  //   if (_type) {
-  //     param.enum = _type.enum
-  //   }
-  // }
+  const operation = _getOperation(req, this)
+  if (!operation || !operation.params) return
 
-  const errors = []
-  const data = req.data
-  const arrayData = Array.isArray(data) ? data : [data]
+  const data = req.data || {}
 
-  for (const row of arrayData) {
-    _processActionFunction(row, eventParams, errors, req.event, this)
+  // REVISIT: skip for mtxs as their models contain invalidities (e.g., properties modeled as strings but provided as objects)
+  const is_mtxs = operation.name.match(/^cds\.xt\./)
+
+  // validate data
+  if (cds.env.features.cds_validate && !is_mtxs) {
+    const assertOptions = { mandatories: true }
+    let errs = cds.validate(data, operation, assertOptions)
+    if (errs) {
+      if (errs.length === 1) throw errs[0]
+      throw Object.assign(new Error('MULTIPLE_ERRORS'), { statusCode: 400, details: errs })
+    }
   }
 
-  _callError(req, errors)
+  // REVISIT: the below is still needed if !cds.env.features.cds_validate because cds.validate doesn't throw missing mandatory struct.
+  //          look for comment "skip struct-likes as we check flat payloads above, and deep payloads via struct.validate()".
+  //          structured params are _not_ flattened and, hence, the assumption in the comment is incorrect (or the flattening must be done).
+  const errors = []
+  const arrayData = Array.isArray(data) ? data : [data]
+  for (const row of arrayData) _processActionFunction(row, operation.params, errors, req.event, this)
+  if (errors.length) for (const error of errors) req.error(error)
 }
 
 commonGenericInput._initial = true
 _actionFunctionHandler._initial = true
 
 module.exports = cds.service.impl(function () {
-  if (cds.env.fiori.lean_draft) {
-    this.before(['CREATE', 'UPDATE'], '*', commonGenericInput)
-  } else {
-    this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', commonGenericInput)
-  }
+  this.before(['CREATE', 'UPDATE'], '*', commonGenericInput)
+
   const operationNames = []
 
   for (const operation of this.operations) {
@@ -408,3 +407,6 @@ module.exports = cds.service.impl(function () {
     }
   }
 })
+
+// needed for testing
+module.exports.commonGenericInput = commonGenericInput

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

@@ -45,5 +45,6 @@ const _addPaging = function ({ SELECT }, target) {
   if (SELECT.from.SELECT?.limit) _addPaging(SELECT.from, target)
 }
 
+// needed in lean draft
 exports.getPageSize = getPageSize
 exports.commonGenericPaging = commonGenericPaging

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

@@ -92,4 +92,5 @@ module.exports = cds.service.impl(function () {
   this.before('READ', '*', commonGenericSorting)
 })
 
+// needed in lean draft
 module.exports.handler = commonGenericSorting

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

@@ -40,8 +40,8 @@ const _getTimeDelta = (target, queryOption) => {
  * @param req
  */
 const commonGenericTemporal = function (req) {
-  // REVISIT: public API for query options
-  const { _queryOptions } = req
+  // REVISIT: remove req._queryOptions with okra
+  const _queryOptions = req.constructor.name === 'ODataRequest' ? req._queryOptions : req.req?.query
 
   // REVISIT: stable access
   const _ = (req.context && req.context._) || req._
@@ -78,6 +78,12 @@ const commonGenericTemporal = function (req) {
       _getDateFromQueryOptions(_queryOptions['sap-valid-to'] ?? normalizeTimestamp('9999-12-31T23:59:59.9999999Z'))
     )
   }
+
+  // REVISIT: needed without okra
+  if (req.constructor.name !== 'ODataRequest') {
+    req._['VALID-FROM'] = _['VALID-FROM']
+    req._['VALID-TO'] = _['VALID-TO']
+  }
 }
 
 /**

package/libx/_runtime/common/i18n/index.js

@@ -78,7 +78,7 @@ module.exports = (key, locale = '', args = {}) => {
       const argtext = i18ns[locale][arg] || i18ns[''][arg] || i18ns.default[arg]
       text = text.replace(match, argtext || (arg != null ? arg : 'NULL'))
     }
-  } catch (e) {
+  } catch {
     // nothing to do
   }
 

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

@@ -43,7 +43,8 @@ ACTION=action
 ASSERT_VALID_ELEMENT=Element is not valid
 ASSERT_RANGE=Value {0} is not in specified range [{1}, {2}]
 ASSERT_FORMAT=Value "{0}" is not in specified format "{1}"
-ASSERT_DATA_TYPE=Value {0} is invalid according to type definition "{1}"
+ASSERT_DATA_TYPE=Value {0} is not a valid {1}
+ASSERT_ARRAY=Value must be an array
 ASSERT_ENUM=Value {0} is invalid according to enum declaration {{1}}
 ASSERT_NOT_NULL=Value is required
 ASSERT_TARGET="Value doesn't exist"
@@ -91,6 +92,7 @@ DRAFT_ALREADY_EXISTS=A draft for this entity already exists
 DRAFT_NOT_EXISTING=No draft for this entity exists
 DRAFT_LOCKED_BY_ANOTHER_USER=The entity is locked by user "{0}"
 DRAFT_MODIFICATION_ONLY_VIA_ROOT=A draft can only be modified via its root entity
+ACTIVE_MODIFICATION_VIA_DRAFT=Active entities cannot be modified via draft request
 DRAFT_ACTIVE_DELETE_FORBIDDEN_DRAFT_EXISTS=Entity cannot be deleted because a draft exists
 
 # singleton

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

@@ -2,8 +2,12 @@ const getTemplate = require('./template')
 const templateProcessor = require('./templateProcessor')
 
 // convert the standard base64 encoding to the URL-safe variant
-const toBase64url = value =>
-  (Buffer.isBuffer(value) ? value.toString('base64') : value).replace(/\//g, '_').replace(/\+/g, '-')
+const toBase64url = value => {
+  const buffer = Buffer.isBuffer(value) ? value : Buffer.from(value, 'base64')
+  const base64url = buffer.toString('base64url')
+  // Buffer base64url encoding does not have padding by default -> add it
+  return base64url.padEnd(Math.ceil(base64url.length / 4) * 4, '=')
+}
 
 const normalizeBase64string = value => {
   if (typeof value !== 'string') return value
@@ -11,6 +15,8 @@ const normalizeBase64string = value => {
   return Buffer.from(value, 'base64').toString('base64')
 }
 
+// REVISIT: The function is only used in okra.
+// To be removed with the function normalizeBase64string above
 const isInvalidBase64string = value => {
   if (Buffer.isBuffer(value)) return // ok
 

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

@@ -169,7 +169,11 @@ const _iteratePropsInNewEntry = (newEntry, keys, result, oldEntry, entity, opts)
     }
 
     // if value did not change --> ignored
-    if (newEntry[prop] === (oldEntry && oldEntry[prop]) || (opts.ignoreDraftColumns && prop in DRAFT_COLUMNS_MAP)) {
+    if (
+      newEntry[prop] === (oldEntry && oldEntry[prop]) ||
+      (oldEntry && entity.elements[prop]?.['@Core.Immutable']) ||
+      (opts.ignoreDraftColumns && prop in DRAFT_COLUMNS_MAP)
+    ) {
       continue
     }
 

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

@@ -5,18 +5,18 @@ const _deepCopy = arg => {
     return Buffer.from(arg)
   }
   if (Array.isArray(arg)) {
-    return deepCopyArray(arg)
+    return _deepCopyArray(arg)
   }
   if (arg instanceof Readable) {
     return arg
   }
   if (typeof arg === 'object') {
-    return deepCopyObject(arg)
+    return _deepCopyObject(arg)
   }
   return arg
 }
 
-const deepCopyArray = arr => {
+const _deepCopyArray = arr => {
   if (!arr) return arr
   const clone = []
   for (const item of arr) {
@@ -25,7 +25,7 @@ const deepCopyArray = arr => {
   return clone
 }
 
-const deepCopyObject = obj => {
+const _deepCopyObject = obj => {
   if (!obj) return obj
   const clone = {}
   for (const key in obj) {
@@ -35,15 +35,10 @@ const deepCopyObject = obj => {
 }
 
 const deepCopy = data => {
-  if (Array.isArray(data)) {
-    return deepCopyArray(data)
-  }
-
-  return deepCopyObject(data)
+  if (Array.isArray(data)) return _deepCopyArray(data)
+  return _deepCopyObject(data)
 }
 
 module.exports = {
-  deepCopyObject,
-  deepCopyArray,
   deepCopy
 }

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

@@ -1,5 +1,3 @@
-/* eslint-disable complexity */
-
 const cds = require('../../cds')
 const { SELECT, INSERT, DELETE, UPDATE } = cds.ql
 const Query = require('../../../../lib/ql/Query')
@@ -11,8 +9,7 @@ const { getEntityNameFromCQN } = require('./entityFromCqn')
 const getError = require('../../common/error')
 const { rewriteAsterisks } = require('./rewriteAsterisks')
 const { getEntityFromPath } = require('../../common/utils/path')
-const { removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
-const { addRefToWhereIfNecessary } = require('../../../odata/parse/afterburner')
+const { addRefToWhereIfNecessary } = require('../../../odata/utils')
 const { addAliasToExpression, PARENT_ALIAS, FOREIGN_ALIAS } = require('../../db/utils/generateAliases')
 const { getColumns } = require('./columns')
 
@@ -429,7 +426,6 @@ const _convertWhereExistsColumn = (column, model, options, queryTarget) => {
   }
 }
 
-// eslint-disable-next-line complexity
 const convertWhereExists = (query, model, options, currentTarget) => {
   const { where, columns, expand } = query
   let innerAlias, outerAlias, queryTarget
@@ -672,13 +668,7 @@ const _convertPathExpression = (query, model, options = {}) => {
   }
 
   // TODO: REVISIT: We need to add alias to subselect in .where, .columns, .from, ... etc
-  if (where) {
-    if (options._4fiori) {
-      query.where(where)
-    } else {
-      query.where({ xpr: removeIsActiveEntityRecursively(where) })
-    }
-  }
+  if (where) query.where(where)
 }
 
 const _convertToOneEqNullInFilter = (query, target) => {
@@ -713,7 +703,6 @@ const _convertToOneEqNullInFilter = (query, target) => {
   }
 }
 
-// eslint-disable-next-line complexity
 const _convertSelect = (query, model, _options) => {
   const _4db = _options.service?.isDatabaseService
   const options = Object.assign(
@@ -765,6 +754,19 @@ const _convertSelect = (query, model, _options) => {
   _convertOrderByOrWhereIfSkip(query, entityName, model)
 
   if (query.SELECT.search && !options.suppressSearch) {
+    // COMPAT:  new protocol adapter captures input as single "val"
+    //          old db expects it as cqn xpr
+    if (query.SELECT.search.length === 1) {
+      query.SELECT.search = query.SELECT.search[0].val
+        .replace(/"/g, '')
+        .split(' ')
+        .reduce((arr, val, i) => {
+          if (i > 0) arr.push('and')
+          arr.push({ val })
+          return arr
+        }, [])
+    }
+
     search2cqn4sql(query, model, { ...query._searchOptions, ...{ entityName, alias } })
   }
 
@@ -800,7 +802,7 @@ const _convertSelect = (query, model, _options) => {
   if (options._4db && !query.SELECT.columns) {
     let target = query._target
     if (target && target._unresolved && typeof target.name === 'string') {
-      target = model.definitions[cds.env.fiori.lean_draft ? target.name : ensureNoDraftsSuffix(target.name)] || target
+      target = model.definitions[target.name] || target
     }
 
     if (target && !Object.prototype.hasOwnProperty.call(target, '_unresolved')) {

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

@@ -3,12 +3,11 @@ const { SELECT } = cds.ql
 
 const { compareJson } = require('./compareJson')
 const { selectDeepUpdateData } = require('../composition')
-const { ensureDraftsSuffix } = require('../../fiori/utils/handler')
+const { ensureDraftsSuffix } = require('./draft')
 
 const { DRAFT_COLUMNS_MAP } = require('../constants/draft')
 const { cqn2cqn4sql, convertPathExpressionToWhere } = require('./cqn2cqn4sql')
 const { revertData } = require('./resolveView')
-const { removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
 const { enrichDataWithKeysFromWhere } = require('./keys')
 
 module.exports = class Differ {
@@ -38,7 +37,7 @@ module.exports = class Differ {
   }
 
   async _diffDelete(req) {
-    const { DELETE } = cds.env.fiori.lean_draft ? req.query : (req._ && req._.query) || req.query
+    const { DELETE } = req.query
     const target = DELETE._transitions?.[DELETE._transitions.length - 1]?.target || req.target
     const query = SELECT.from(DELETE.from).columns(this._createSelectColumnsForDelete(target))
     if (DELETE.where) query.where(DELETE.where)
@@ -71,9 +70,7 @@ module.exports = class Differ {
       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(draftRef).where(removeIsActiveEntityRecursively(where)).limit(1))
+      req._.partialPersistentState = await cds.tx(req).run(SELECT.from(draftRef).where(where).limit(1))
 
       return compareJson(providedData || req.data, req._.partialPersistentState, req.target, {
         ignoreDraftColumns: true

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

@@ -1,5 +1,5 @@
 const { where2obj } = require('./cqn')
-const { deepCopyArray } = require('./copy')
+const { deepCopy } = require('./copy')
 const { getOnCond } = require('./generateOnCond')
 
 function _getOnCondElements(onCond, onCondElements = []) {
@@ -7,19 +7,23 @@ function _getOnCondElements(onCond, onCondElements = []) {
 
   const ref0 = onCond[0].xpr ? onCond[0].xpr[0].ref : onCond[0].ref
   const ref1 = onCond[0].xpr ? onCond[0].xpr[2].ref : onCond[2].ref
+  const val0 = onCond[0].xpr ? onCond[0].xpr[0].val : onCond[0].val
+  const val1 = onCond[0].xpr ? onCond[0].xpr[2].val : onCond[2].val
 
-  let entityRef, targetRef
-  if (ref0 && ref0[0] === 'target') {
+  let entityRef, targetRef, entityVal
+  if (ref0?.[0] === 'target') {
     targetRef = ref0
     entityRef = ref1
-  } else if (ref1 && ref1[0] === 'target') {
+    entityVal = val1
+  } else if (ref1?.[0] === 'target') {
     targetRef = ref1
     entityRef = ref0
+    entityVal = val0
   }
 
   const entityKey = entityRef && entityRef.slice(1).join('.')
   const targetKey = targetRef && targetRef.slice(1).join('.')
-  onCondElements.push({ entityKey, targetKey })
+  onCondElements.push({ entityKey, targetKey, entityVal })
 
   if (andIndex !== -1) {
     _getOnCondElements(onCond.slice(andIndex + 1), onCondElements)
@@ -30,7 +34,7 @@ function _getOnCondElements(onCond, onCondElements = []) {
 function _mergeWhere(base, additional) {
   if (additional?.length) {
     // copy where else query will be modified
-    const whereCopy = deepCopyArray(additional)
+    const whereCopy = deepCopy(additional)
     if (base.length > 0) base.push('and')
     base.push(...whereCopy)
   }
@@ -39,12 +43,7 @@ function _mergeWhere(base, additional) {
 
 function _modifyWhereWithNavigations(where, newWhere, entityKey, targetKey) {
   _mergeWhere(newWhere, where)
-
-  newWhere.forEach(element => {
-    if (element.ref && element.ref[0] === targetKey) {
-      element.ref = [entityKey]
-    }
-  })
+  _renameOnUp(newWhere, entityKey, targetKey)
 }
 
 function _buildWhereForNavigations(ref, newWhere, model, target) {
@@ -66,7 +65,7 @@ function _buildWhereForNavigations(ref, newWhere, model, target) {
       const targetKeyElement = navigationElement._target.elements[key.entityKey]
 
       if (targetKeyElement && (targetKeyElement.isAssociation || targetKeyElement._foreignKey4)) {
-        _modifyWhereWithNavigations(!whereAdded && currentRef.where, newWhere, key.entityKey, key.targetKey, whereAdded)
+        _modifyWhereWithNavigations(!whereAdded && currentRef.where, newWhere, key.entityKey, key.targetKey)
         whereAdded = true
       }
     }
@@ -74,7 +73,66 @@ function _buildWhereForNavigations(ref, newWhere, model, target) {
   }
 }
 
-function _getWhereFromInsert(query, target, model) {
+function _renameOnUp(newWhere, entityKey, targetKey) {
+  let renamed = false
+  newWhere.forEach(element => {
+    if (element.ref && element.ref[0] === targetKey) {
+      element.ref = [entityKey]
+      renamed = true
+    }
+  })
+  return renamed
+}
+
+function calculateWhereForNavigationsFromRefPath(ref, newWhere, target) {
+  const currentRef = ref[0]
+  const nextRef = ref[1]
+
+  if (nextRef) {
+    const csnEntity = target
+    const navigationElement = csnEntity && csnEntity.elements[nextRef.id || nextRef]
+
+    if (!navigationElement || !navigationElement.on) return
+
+    const onCond = target._relations[nextRef.id || nextRef].join('target', 'source')
+    const nextKeys = _getOnCondElements(onCond[0].xpr)
+
+    const seg_keys = where2obj(currentRef.where ?? [])
+    for (const key of nextKeys) {
+      if (navigationElement.is2one && csnEntity.elements[key.entityKey] && !navigationElement._isSelfManaged) {
+        // foreign key in root
+        continue
+      }
+
+      const targetKeyElement = navigationElement._target.elements[key.targetKey]
+
+      if (targetKeyElement && key.targetKey && key.entityKey) {
+        if (newWhere.length) {
+          if (_renameOnUp(newWhere, key.targetKey, key.entityKey)) {
+            continue
+          }
+          newWhere.push('and')
+        }
+        newWhere.push({ ref: [key.targetKey] }, '=', { val: seg_keys[key.entityKey] })
+      } else if (targetKeyElement && key.targetKey && key.entityVal !== undefined) {
+        if (newWhere.length) newWhere.push('and')
+        newWhere.push({ ref: [key.targetKey] }, '=', { val: key.entityVal })
+      }
+    }
+    calculateWhereForNavigationsFromRefPath(ref.slice(1), newWhere, navigationElement._target)
+  }
+}
+
+function getKeysForNavigationFromRefPath(ref, target) {
+  const where = []
+  calculateWhereForNavigationsFromRefPath(ref, where, target)
+  if (where.length) {
+    return where2obj(where)
+  }
+  return {}
+}
+
+function _getWhereFromInsert(query, model) {
   const where = []
   if (query.INSERT.into.ref && query.INSERT.into.ref.length > 1) {
     _buildWhereForNavigations(query.INSERT.into.ref, where, model)
@@ -82,7 +140,7 @@ function _getWhereFromInsert(query, target, model) {
   return where
 }
 
-function _getWhereFromUpdate(query, target, model) {
+function _getWhereFromUpdate(query, model) {
   if (query.UPDATE.entity.ref && query.UPDATE.entity.ref.length > 1) {
     const where = []
     _buildWhereForNavigations(query.UPDATE.entity.ref, where, model)
@@ -99,12 +157,12 @@ function _getWhereFromUpdate(query, target, model) {
 // params: data, req, service/tx
 function enrichDataWithKeysFromWhere(data, { query, target }, { model }) {
   if (query.INSERT) {
-    const where = _getWhereFromInsert(query, target, model)
+    const where = _getWhereFromInsert(query, model)
     if (!where || !where.length) return
     if (!Array.isArray(data)) data = [data]
     for (const d of data) Object.assign(d, where2obj(where, target))
   } else if (query.UPDATE) {
-    const where = _getWhereFromUpdate(query, target, model)
+    const where = _getWhereFromUpdate(query, model)
     if (!where || !where.length) return
     // REVISIT: We should not expect data to be present always!
     if (!data) data = query.UPDATE.data = {}
@@ -114,5 +172,6 @@ function enrichDataWithKeysFromWhere(data, { query, target }, { model }) {
 
 module.exports = {
   where2obj,
-  enrichDataWithKeysFromWhere
+  enrichDataWithKeysFromWhere,
+  getKeysForNavigationFromRefPath
 }