@sap/cds 6.3.2 → 6.4.1

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'
 
@@ -658,6 +679,8 @@ const findQueryTarget = q => {
     ? q.INSERT._transitions[q.INSERT._transitions.length - 1].target
     : q.UPDATE
     ? q.UPDATE._transitions[q.UPDATE._transitions.length - 1].target
+    : q.UPSERT
+    ? q.UPSERT._transitions[q.UPSERT._transitions.length - 1].target
     : q.DELETE
     ? q.DELETE._transitions[q.DELETE._transitions.length - 1].target
     : undefined

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' })

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

@@ -36,6 +36,10 @@ class InsertBuilder extends BaseBuilder {
     this._csn = csn
   }
 
+  annotatedColumns(entityName, csn) {
+    return getAnnotatedColumns(entityName, csn)
+  }
+
   /**
    * Builds an Object based on the properties of the CQN object.
    *
@@ -77,7 +81,7 @@ class InsertBuilder extends BaseBuilder {
     this._findUuidKeys(entityName)
 
     this._columnIndexesToDelete = []
-    const annotatedColumns = getAnnotatedColumns(entityName, this._csn)
+    const annotatedColumns = this.annotatedColumns(entityName, this._csn)
 
     if (this._obj.INSERT.columns) {
       this._removeAlreadyExistingInsertAnnotatedColumnsFromMap(annotatedColumns)

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

@@ -0,0 +1,24 @@
+const InsertBuilder = require('./InsertBuilder')
+const getAnnotatedColumns = require('./annotations')
+
+class UpsertBuilder extends InsertBuilder {
+  constructor(obj, options, csn) {
+    super(obj, options, csn)
+  }
+
+  annotatedColumns(entityName, csn) {
+    const { updateAnnotatedColumns } = getAnnotatedColumns(entityName, csn)
+    return { insertAnnotatedColumns: updateAnnotatedColumns }
+  }
+
+  // REVISIT: We need to copy over the implementation for annotation handling
+  build() {
+    this._obj = { INSERT: this._obj.UPSERT }
+    super.build()
+    this._outputObj.sql = this._outputObj.sql.replace('INSERT INTO', 'UPSERT')
+    this._outputObj.sql += ' WITH PRIMARY KEY'
+    return this._outputObj
+  }
+}
+
+module.exports = UpsertBuilder

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

@@ -16,7 +16,10 @@ const _getAnnotationNames = column => {
 const getAnnotatedColumns = (entityName, csn) => {
   const entityNameWithoutSuffix = ensureNoDraftsSuffix(entityName)
   if (!csn || !csn.definitions[entityNameWithoutSuffix]) {
-    return undefined
+    return {
+      insertAnnotatedColumns: new Map(),
+      updateAnnotatedColumns: new Map()
+    }
   }
   const columns = getColumns(csn.definitions[entityNameWithoutSuffix])
   const insertAnnotatedColumns = new Map()
@@ -39,8 +42,8 @@ const getAnnotatedColumns = (entityName, csn) => {
   }
 
   return {
-    insertAnnotatedColumns: insertAnnotatedColumns,
-    updateAnnotatedColumns: updateAnnotatedColumns
+    insertAnnotatedColumns,
+    updateAnnotatedColumns
   }
 }
 

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

@@ -3,6 +3,7 @@ const DropBuilder = require('./DropBuilder')
 const SelectBuilder = require('./SelectBuilder')
 const InsertBuilder = require('./InsertBuilder')
 const UpdateBuilder = require('./UpdateBuilder')
+const UpsertBuilder = require('./UpsertBuilder')
 const DeleteBuilder = require('./DeleteBuilder')
 const ExpressionBuilder = require('./ExpressionBuilder')
 const ReferenceBuilder = require('./ReferenceBuilder')
@@ -18,6 +19,7 @@ module.exports = {
   SelectBuilder,
   InsertBuilder,
   UpdateBuilder,
+  UpsertBuilder,
   DeleteBuilder,
   ExpressionBuilder,
   ReferenceBuilder,

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

@@ -2,6 +2,7 @@ const DeleteBuilder = require('./DeleteBuilder')
 const InsertBuilder = require('./InsertBuilder')
 const SelectBuilder = require('./SelectBuilder')
 const UpdateBuilder = require('./UpdateBuilder')
+const UpsertBuilder = require('./UpsertBuilder')
 const CreateBuilder = require('./CreateBuilder')
 const DropBuilder = require('./DropBuilder')
 
@@ -16,6 +17,10 @@ const _getCustomBuilderIfExists = (options, type) => {
         return options.customBuilder.UpdateBuilder
       }
 
+      case 'UPSERT': {
+        return options.customBuilder.UpsertBuilder
+      }
+
       case 'DELETE': {
         return options.customBuilder.DeleteBuilder
       }
@@ -77,6 +82,10 @@ const build = (cqn, options, csn) => {
     return build(_getCustomBuilderIfExists(options, 'UPDATE') || UpdateBuilder)
   }
 
+  if (cqn.UPSERT) {
+    return build(_getCustomBuilderIfExists(options, 'UPSERT') || UpsertBuilder)
+  }
+
   if (cqn.DELETE) {
     return build(_getCustomBuilderIfExists(options, 'DELETE') || DeleteBuilder)
   }

package/libx/_runtime/db/utils/columns.js

@@ -16,12 +16,14 @@ const getColumns = (entity, { _4db, onlyKeys } = { _4db: true, onlyKeys: false }
   if (!(entity && entity.elements)) return []
   const columnNames = []
   // REVISIT!!!
-  const elements = Object.getPrototypeOf(entity.elements) || entity.elements
+  const elements = cds.env.features.lean_draft
+    ? entity.elements
+    : Object.getPrototypeOf(entity.elements) || entity.elements
   for (const elementName in elements) {
     const element = elements[elementName]
     if (onlyKeys && !element.key) continue
     if (element.isAssociation) continue
-    if (_4db && entity._isDraftEnabled && elementName in DRAFT_COLUMNS_MAP) continue
+    if (!cds.env.features.lean_draft && _4db && entity._isDraftEnabled && elementName in DRAFT_COLUMNS_MAP) continue
     if ((cds.env.effective.odata.structs || cds.env.features.ucsn_struct_conversion) && element.elements) {
       columnNames.push(...resolveStructured({ element, structProperties: [] }, false))
       continue

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

@@ -714,16 +714,6 @@ const _getSiblingScenario = (req, columns, model, siblingIndex, nav) => {
   const _getSiblingQueryFromWhere = (query, queryIndex, parentQuery) => {
     if (query.SELECT && query.SELECT.where && queryIndex > 0) {
       for (let i = 0; i < query.SELECT.where.length; i++) {
-        if (query.SELECT.where[i].xpr && queryIndex > 0) {
-          const sibilingQueryFromWhere = _getSiblingQueryFromWhere(
-            { SELECT: { where: query.SELECT.where[i].xpr } },
-            queryIndex - 1,
-            query
-          )
-
-          if (sibilingQueryFromWhere) return sibilingQueryFromWhere
-        }
-
         if (query.SELECT.where[i] === 'exists' && queryIndex > 0) {
           return _getSiblingQueryFromWhere(query.SELECT.where[i + 1], queryIndex - 1, query)
         }
@@ -757,7 +747,6 @@ const _replaceWhereExists = (query, _siblingIndex, siblingCQN) => {
 
       const indexExists = query.SELECT.where.indexOf('exists')
       if (indexExists > -1) {
-        if (_siblingIndex > 0) return _replaceWhereExists(query.SELECT.where[indexExists + 1], _siblingIndex - 1)
         query.SELECT.where.splice(indexExists + 1, 1, siblingCQN)
       }
     }
@@ -1019,7 +1008,7 @@ const _generateCQN = (req, columns, from, model) => {
   let siblingIndex = nav.indexOf('SiblingEntity')
 
   // it can also be a property access (new parser), then we must shift it
-  if (siblingIndex === 1 && req.target.elements[nav[0]]) {
+  if (siblingIndex > 0 && req.target.elements[nav[0]] && !req.target.elements[nav[0]].isAssociation) {
     nav.shift()
     siblingIndex = siblingIndex - 1
   }