@sap/cds 8.8.3 → 8.9.0

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

@@ -1,7 +1,6 @@
 const cds = require('../../cds')
 const { SELECT, INSERT, DELETE, UPDATE } = cds.ql
 const Query = require('../../../../lib/ql/cds.ql-Query')
-const { resolveView } = require('./resolveView')
 const { ensureNoDraftsSuffix, getDraftColumnsCQNForDraft, ensureDraftsSuffix } = require('./draft')
 const { flattenStructuredSelect, OPERATIONS_MAP } = require('./structured')
 const search2cqn4sql = require('./search2cqn4sql')
@@ -854,7 +853,7 @@ const _convertUpsert = (query, model) => {
   }
   Object.assign(upsert.UPSERT, { into: { ref: [resolvedIntoClause], as: query.UPSERT.into.as } })
 
-  const resolved = resolveView(upsert, model, cds.db)
+  const resolved = cds.ql.resolve.resolve4db(upsert, cds.db)
   // required for deploying of extensions, not used anywhere else except UpsertBuilder
   resolved._target = resolved.UPSERT?._transitions?.[0].target || query._target
   // resolved._target = query._target
@@ -881,7 +880,7 @@ const _convertInsert = (query, model) => {
 
   const target = model.definitions[resolvedIntoClause]
   if (!target) return insert
-  return resolveView(insert, model, cds.db)
+  return cds.ql.resolve.resolve4db(insert, cds.db)
 }
 
 function _modifyNavigationInWhere(whereClause, target) {
@@ -913,7 +912,7 @@ const _plainDelete = (cqn, model) => {
 
   if (!target) return cqn
 
-  return resolveView(cqn, model, cds.db)
+  return cds.ql.resolve.resolve4db(cqn, cds.db)
 }
 
 const _convertDelete = (query, model, options) => {
@@ -946,7 +945,7 @@ const _convertDelete = (query, model, options) => {
 
   if (!targetEntity) return deleet
 
-  return resolveView(deleet, model, cds.db)
+  return cds.ql.resolve.resolve4db(deleet, cds.db)
 }
 
 function _plainUpdate(cqn, model) {
@@ -958,7 +957,7 @@ function _plainUpdate(cqn, model) {
   }
 
   if (!target) return cqn
-  return resolveView(cqn, model, cds.db)
+  return cds.ql.resolve.resolve4db(cqn, cds.db)
 }
 
 const _convertUpdate = (query, model, options) => {
@@ -996,7 +995,7 @@ const _convertUpdate = (query, model, options) => {
 
   if (!targetEntity) return update
 
-  return resolveView(update, model, cds.db)
+  return cds.ql.resolve.resolve4db(update, cds.db)
 }
 
 /**

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

@@ -67,7 +67,7 @@ module.exports = class Differ {
     const combinedData = providedData || Object.assign({}, req.query.UPDATE.data || {}, req.query.UPDATE.with || {})
     enrichDataWithKeysFromWhere(combinedData, req, this._srv)
     const lastTransition = newQuery.UPDATE._transitions[newQuery.UPDATE._transitions.length - 1]
-    const revertedPersistent = revertData(req._.partialPersistentState, lastTransition, this._srv)
+    const revertedPersistent = revertData(req._.partialPersistentState, lastTransition, cds.db)
     const diff = compareJson(combinedData, revertedPersistent, req.target, { ignoreDraftColumns: true })
     return diff
   }

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

@@ -1,4 +1,4 @@
-const cds = require('../../cds')
+const cds = require('../../../../lib')
 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 : []

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

@@ -68,8 +68,12 @@ const _parentFieldsFromSimpleOnCond = (element, subOn) => {
   }
 
   if (!childElement.on) {
-    if (element._isSelfManaged) return _foreignKeyPropagationsFromToManyOn(element, childFieldName)
-    if (parentElement) return [{ fillChild: true, parentElement, childElement }]
+    const propagations = []
+    if ('val' in subOn[idxParentField])
+      propagations.push({ fillChild: true, parentFieldValue: subOn[idxParentField].val, childElement })
+    if (element._isSelfManaged)
+      return [...propagations, ..._foreignKeyPropagationsFromToManyOn(element, childFieldName)]
+    if (parentElement) return [...propagations, { fillChild: true, parentElement, childElement }]
   }
 
   if ('val' in subOn[idxParentField]) {

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

@@ -1,35 +1,6 @@
 const { where2obj } = require('./cqn')
 const { deepCopy } = require('./copy')
-const { getOnCond } = require('./generateOnCond')
-
-function _getOnCondElements(onCond, onCondElements = []) {
-  const andIndex = onCond.indexOf('and')
-
-  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, entityVal
-  if (ref0?.[0] === 'target') {
-    targetRef = ref0
-    entityRef = ref1
-    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, entityVal })
-
-  if (andIndex !== -1) {
-    _getOnCondElements(onCond.slice(andIndex + 1), onCondElements)
-  }
-  return onCondElements
-}
+const { foreignKeyPropagations } = require('./foreignKeyPropagations')
 
 function _mergeWhere(base, additional) {
   if (additional?.length) {
@@ -56,16 +27,20 @@ function _buildWhereForNavigations(ref, newWhere, model, target) {
 
     if (!navigationElement || !navigationElement.on) return
 
-    const onCond = getOnCond(navigationElement, [navigationElement.name], { select: 'source', join: 'target' })
-    const nextKeys = _getOnCondElements(onCond[0].xpr)
+    const nextKeys = foreignKeyPropagations(navigationElement)
 
     // only add where once in _modifyWhereWithNavigations
     let whereAdded = false
     for (const key of nextKeys) {
-      const targetKeyElement = navigationElement._target.elements[key.entityKey]
+      const targetKeyElement = navigationElement._target.elements[key.childElement.name]
 
       if (targetKeyElement && (targetKeyElement.isAssociation || targetKeyElement._foreignKey4)) {
-        _modifyWhereWithNavigations(!whereAdded && currentRef.where, newWhere, key.entityKey, key.targetKey)
+        _modifyWhereWithNavigations(
+          !whereAdded && currentRef.where,
+          newWhere,
+          key.childElement.name,
+          key.parentElement.name
+        )
         whereAdded = true
       }
     }
@@ -76,6 +51,9 @@ function _buildWhereForNavigations(ref, newWhere, model, target) {
 function _renameOnUp(newWhere, entityKey, targetKey) {
   let renamed = false
   newWhere.forEach(element => {
+    if (element.xpr && element.xpr.length) {
+      renamed = _renameOnUp(element.xpr, entityKey, targetKey) || renamed
+    }
     if (element.ref && element.ref[0] === targetKey) {
       element.ref = [entityKey]
       renamed = true
@@ -84,54 +62,6 @@ function _renameOnUp(newWhere, entityKey, targetKey) {
   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) {
@@ -172,6 +102,5 @@ function enrichDataWithKeysFromWhere(data, { query, target }, { model }) {
 
 module.exports = {
   where2obj,
-  enrichDataWithKeysFromWhere,
-  getKeysForNavigationFromRefPath
+  enrichDataWithKeysFromWhere
 }

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

@@ -5,6 +5,7 @@ const { prefixForStruct } = require('../../common/utils/csn')
 const _autoGenerate = e => e && e.isUUID && e.key
 
 const _set = (row, value, element, enumerable) => {
+  if (value === undefined) return // only if properly propagated/generated
   if (!element.parent.elements[element.name]) return // only when in model
   if (!enumerable && element.foreignKeySource) {
     // only for foreign keys
@@ -86,7 +87,7 @@ module.exports = (
   row,
   foreignKeyPropagations,
   isCompositionEffective,
-  { deleteAssocs = false, enumerable = true } = {}
+  { deleteAssocs = false, enumerable = true, generateKeys = true } = {}
 ) => {
   if (!row || !(tKey in row)) return
   if (row[tKey] === null) {
@@ -109,11 +110,11 @@ module.exports = (
         // 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 (!(pk in row) && generateKeys) _generateParentField(foreignKeyPropagation, row, enumerable, generateKeys)
 
         if (isCompositionEffective) _propagateToChild(foreignKeyPropagation, row, childRow, enumerable)
       } else {
-        if (isCompositionEffective) _generateChildField(foreignKeyPropagation, childRow, enumerable)
+        if (isCompositionEffective && generateKeys) _generateChildField(foreignKeyPropagation, childRow, enumerable)
         _propagateToParent(foreignKeyPropagation, childRow, row, enumerable)
       }
     }