@sap/cds 6.5.0 → 6.6.0

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

@@ -36,10 +36,10 @@ const _getSimpleCategory = category => {
 }
 
 const _isDraftCoreComputed = (req, element, event) =>
+  element['@Core.Computed'] &&
   cds.env.features.preserve_computed !== false &&
   req._ &&
   req._.event === 'draftActivate' &&
-  element['@Core.Computed'] &&
   !((event === 'CREATE' && element['@cds.on.insert']) || element['@cds.on.update'])
 
 const _isStreamingProperty = (elements, row, property) =>
@@ -217,16 +217,8 @@ const _callError = (req, errors) => {
   for (const error of errors) req.error(error)
 }
 
-const _isBoundAction = req => !!(req.getUriInfo && req.getUriInfo().getLastSegment().getKind() === 'BOUND.ACTION')
-
-const _getBoundActionBindingParameter = req => {
-  // REVISIT: req._ gets set in onDraftActivate to original req
-  const action = (req._ && req._.event) || req.event
-  const actions = req.target.actions
-
-  // 'in' is the default binding parameter name for bound actions/functions
-  return (actions && actions[action] && actions[action]['@cds.odata.bindingparameter.name']) || 'in'
-}
+const _getBoundAction = req => req.target.actions?.[req.context?.event]
+const _getBoundActionBindingParameter = action => action['@cds.odata.bindingparameter.name'] || 'in'
 
 async function commonGenericInput(req) {
   if (!req.query) return // FIXME: the code below expects req.query to be defined
@@ -250,8 +242,10 @@ async function commonGenericInput(req) {
     pathSegments: []
   }
 
-  if (_isBoundAction(req)) {
-    const pathSegment = _getBoundActionBindingParameter(req)
+  const boundAction = _getBoundAction(req)
+
+  if (boundAction) {
+    const pathSegment = _getBoundActionBindingParameter(boundAction)
     const keys = req._ && req._.params && req._.params[0]
     if (pathSegment) pathOptions.pathSegments.push(pathSegment)
 
@@ -370,7 +364,11 @@ commonGenericInput._initial = true
 _actionFunctionHandler._initial = true
 
 module.exports = cds.service.impl(function () {
-  this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', commonGenericInput)
+  if (cds.env.features.lean_draft) {
+    this.before(['CREATE', 'UPDATE'], '*', commonGenericInput)
+  } else {
+    this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', commonGenericInput)
+  }
   const operationNames = []
 
   for (const operation of this.operations) {

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

@@ -142,14 +142,16 @@ const _getWindowWhere = (where, bottomTop) => {
 
 const _getOrderByForWindowFn = bottomTop => {
   const orderBy = _getBottomTopRefOrVal(bottomTop[0], 'ref')[0]
-  orderBy.sort = bottomTop[0].func === 'topcount' ? 'desc' : 'asc'
-  return orderBy
+  const sort = bottomTop[0].func === 'topcount' ? 'desc' : 'asc'
+  return [orderBy, sort]
 }
 
 const _getWindowXpr = (groupBy, bottomTop) => {
-  const xpr = [{ func: 'ROW_NUMBER', args: [] }, 'OVER', '(']
+  const overXpr = { xpr: [] }
+  const xpr = [{ func: 'ROW_NUMBER', args: [] }, 'OVER', overXpr]
+
   if (groupBy)
-    xpr.push(
+    overXpr.xpr.push(
       'PARTITION BY',
       ...groupBy.reduce((acc, el, i) => {
         if (i < groupBy.length - 1) {
@@ -163,9 +165,8 @@ const _getWindowXpr = (groupBy, bottomTop) => {
       }, [])
     )
 
-  xpr.push('ORDER BY', _getOrderByForWindowFn(bottomTop))
-  xpr.push(')')
-  return { xpr: xpr, as: 'rowNumber' }
+  overXpr.xpr.push('ORDER BY', ..._getOrderByForWindowFn(bottomTop))
+  return { xpr, as: 'rowNumber' }
 }
 
 const _isNavCountFunc = el => el.func && el.func === 'count' && el.args[0] !== '*'
@@ -586,6 +587,7 @@ const _convertOrderByOrWhereIfSkip = (cqn, target, model) => {
   }
 }
 
+/* REVISIT: Unused
 const _convertExpand = expand => {
   expand.forEach(expandElement => {
     if (expandElement.ref && expandElement.ref[0]) {
@@ -603,6 +605,7 @@ const _convertExpand = expand => {
     }
   })
 }
+*/
 
 const _simplifyWhere = col => {
   if (col.ref?.[0].where) {
@@ -827,7 +830,11 @@ const _convertUpsert = (query, model) => {
 
   // We add all previous properties ot the newly created query.
   // Reason is to not lose the query API functionality
-  Object.assign(upsert.UPSERT, query.UPSERT, { into: { ref: [resolvedIntoClause], as: query.UPSERT.into.as } })
+
+  for (const key in query.UPSERT) {
+    upsert.UPSERT[key] = query.UPSERT[key]
+  }
+  Object.assign(upsert.UPSERT, { into: { ref: [resolvedIntoClause], as: query.UPSERT.into.as } })
 
   const resolved = resolveView(upsert, model, cds.db)
   // required for deplyoing of extensions, not used anywhere else except UpsertBuilder
@@ -848,7 +855,11 @@ const _convertInsert = (query, model) => {
 
   // We add all previous properties ot the newly created query.
   // Reason is to not lose the query API functionality
-  Object.assign(insert.INSERT, query.INSERT, { into: { ref: [resolvedIntoClause], as: query.INSERT.into.as } })
+  insert.INSERT = {}
+  for (const prop in query.INSERT) {
+    insert.INSERT[prop] = query.INSERT[prop]
+  }
+  Object.assign(insert.INSERT, { into: { ref: [resolvedIntoClause], as: query.INSERT.into.as } })
 
   const target = model.definitions[resolvedIntoClause]
   if (!target) return insert
@@ -900,7 +911,12 @@ const _convertDelete = (query, model, options) => {
 
   const { target, alias, where } = convertPathExpressionToWhere(query.DELETE.from, model, options)
   const deleet = DELETE('x')
-  Object.assign(deleet.DELETE, query.DELETE, { from: target, where: undefined })
+
+  for (const key in query.DELETE) {
+    deleet.DELETE[key] = query.DELETE[key]
+  }
+
+  Object.assign(deleet.DELETE, { from: target, where: undefined })
 
   if (alias) deleet.DELETE.from = { ref: [target], as: alias }
   if (where) deleet.where(where)
@@ -945,7 +961,11 @@ const _convertUpdate = (query, model, options) => {
   // link .with and .data and set query target and remove current where clause
   // REVISIT: update statement does not accept cqn partial as input
   const update = UPDATE('x')
-  Object.assign(update.UPDATE, query.UPDATE, { entity: target, where: undefined })
+  // Object.assign(update.UPDATE, query.UPDATE, { entity: target, where: undefined })
+  for (const key in query.UPDATE) {
+    update.UPDATE[key] = query.UPDATE[key]
+  }
+  Object.assign(update.UPDATE, { entity: target, where: undefined })
 
   if (alias) update.UPDATE.entity = { ref: [target], as: alias }
   if (where) update.where(where)

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

@@ -1,4 +1,3 @@
-const cds = require('../../cds')
 const { ensureNoDraftsSuffix } = require('./draft')
 
 /*

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

@@ -28,7 +28,10 @@ const search2cqn4sql = (query, model, options = {}) => {
     const search2cqnOptions = { columns: computeColumnsToBeSearched(query, entity), locale: options.locale }
     return search2cqn4sql(query, entity, search2cqnOptions)
   } else {
-    const expression = searchToLike(cqnSearchPhrase, computeColumnsToBeSearched(query, entity, alias))
+    const columnsToBeSearched = computeColumnsToBeSearched(query, entity, alias)
+    const expression = columnsToBeSearched?.length
+      ? searchToLike(cqnSearchPhrase, columnsToBeSearched)
+      : [{ val: 0 }, '=', { val: 1 }]
 
     // REVISIT: find out here if where or having must be used
     query._aggregated || /* if new parser */ query.SELECT.groupBy ? query.having(expression) : query.where(expression)

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

@@ -1,20 +1,26 @@
+const cds = require('../../cds')
 const templatePathSerializer = (tKey, keyNames, row, elements, draftKeys) => {
-  const keyValuePairs = keyNames.map(key => {
-    let quote
+  const keyValuePairs = keyNames
+    .filter(key => {
+      if (cds.env.features.lean_draft && key === 'IsActiveEntity') return false
+      return true
+    })
+    .map(key => {
+      let quote
 
-    switch (elements[key].type) {
-      case 'cds.String':
-        quote = "'"
-        break
+      switch (elements[key].type) {
+        case 'cds.String':
+          quote = "'"
+          break
 
-      default:
-        quote = ''
-        break
-    }
+        default:
+          quote = ''
+          break
+      }
 
-    const keyValue = row[key] ?? draftKeys?.[key]
-    return `${key}=${quote}${keyValue}${quote}`
-  })
+      const keyValue = row[key] ?? draftKeys?.[key]
+      return `${key}=${quote}${keyValue}${quote}`
+    })
 
   const keyValuePairsSerialized = keyValuePairs.join(',')
   return `${tKey}(${keyValuePairsSerialized})`

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

@@ -91,7 +91,7 @@ const _getMapperForListedElements = (conversionMap, csn, cqn) => {
     if (col.cast) {
       const name = col.as ? col.as : col.ref[col.ref.length - 1]
       _addConverter(mapper, name, (val, key, row, unaliasedKey) => {
-        row[unaliasedKey || key] = _getCastFunction(col.cast)(val)
+        row[unaliasedKey || key] = val === null ? null : _getCastFunction(col.cast)(val)
       })
       continue
     }

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

@@ -867,7 +867,7 @@ class JoinCQNFromExpanded {
         const subWhere = []
 
         for (const key in entity.keys) {
-          if (key === 'IsActiveEntity') continue
+          if (key === 'IsActiveEntity' || entity.keys[key]._isAssociationStrict) continue
           if (subWhere.length) {
             subWhere.push('and')
           }
@@ -982,7 +982,7 @@ class JoinCQNFromExpanded {
           ...column,
           xpr: column.xpr.map(x => {
             if (x.ref) {
-              const res = this._buildNewAliasColumn(x, entity, tableAlias, mappings)
+              const res = this._buildNewAliasColumn(x, entity, tableAlias, mappings, true)
               delete res.as
               return res
             } else return x
@@ -1013,7 +1013,7 @@ class JoinCQNFromExpanded {
     return column.ref && typeof column.ref[column.ref.length - 1] !== 'string'
   }
 
-  _buildNewAliasColumn(column, entity, tableAlias, mappings) {
+  _buildNewAliasColumn(column, entity, tableAlias, mappings, skipMapping = false) {
     // Casted name, vs column name
     const identifier = this._getIdentifier(column, tableAlias)
     const as = column[SKIP_MAPPING] ? column.as : `${tableAlias}_${identifier}`
@@ -1027,6 +1027,8 @@ class JoinCQNFromExpanded {
       aliasedElement.ref = alias ? [alias, column.ref[0]] : [column.ref[0]]
     }
 
+    if (skipMapping) return aliasedElement
+
     if (!column[SKIP_MAPPING]) {
       mappings[column[IDENTIFIER] || identifier] = as
       if (column[CLEANUP_KEYS]) {

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

@@ -1,5 +1,6 @@
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 const DRAFT_COLUMNS_ARRAY = Object.keys(DRAFT_COLUMNS_MAP)
+const cds = require('../../cds')
 
 const EXPAND = Symbol.for('sap.cds.expand')
 const GET_KEY_VALUE = Symbol.for('sap.cds.getKeyValue')
@@ -110,9 +111,9 @@ class RawToExpanded {
         let expandedItems = this._getResultCache(toManyTree.concat(key))[mapping[GET_KEY_VALUE](false, entry)] || []
 
         // the expanded items may include the actives of the deleted drafts -> filter out
-        if (rootIsActiveEntity !== null) {
+        if (!cds.env.features.lean_draft && rootIsActiveEntity !== null) {
           if (mapping[TO_ACTIVE]) expandedItems = expandedItems.filter(ele => ele.IsActiveEntity !== false)
-          else expandedItems = expandedItems.filter(ele => ele.IsActiveEntity === rootIsActiveEntity)
+          else expandedItems = expandedItems.filter(ele => !!ele.IsActiveEntity === rootIsActiveEntity)
         }
 
         row[key] = !mapping[CLEANUP_KEYS]

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

@@ -197,11 +197,11 @@ function dbGenericInput(req) {
   // call with this for this.model
   normalizeTimeData.call(this, req)
 
-  const draft = req.target.name && req.target.name.match(/_drafts$/)
+  const draft = req.target.name && (req.target.name.match(/_drafts$/) || req.target.name.match(/\.drafts$/))
 
   const target =
     req.target._unresolved && req.target.name
-      ? this.model.definitions[req.target.name.replace(/_drafts$/, '')]
+      ? this.model.definitions[req.target.name] || this.model.definitions[req.target.name.replace(/_drafts$/, '')]
       : req.target
   if (!target || target._unresolved) return
 

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

@@ -333,6 +333,7 @@ const _checkReferenceIntegrity = (entity, data, req, csn, run) => {
 }
 
 const _checkIntegrityWrapper = (req, csn, run) => async (data, entity) => {
+  if (cds.env.features.lean_draft && entity.name?.endsWith('.drafts')) return
   const errors = await _checkReferenceIntegrity(entity, data, req, csn, run)
   if (errors && errors.length !== 0) for (const err of errors) req.error(err)
 }

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

@@ -18,6 +18,7 @@ const _convert = (columns, target, model, alias) => {
     if (element) {
       if (element.virtual) {
         col.as = col.as || col.ref[col.ref.length - 1]
+        col.cast = { type: element._type }
         delete col.ref
         col.val = (element.default && element.default.val) || null
       }

package/libx/_runtime/db/query/read.js

@@ -1,5 +1,6 @@
 const { timestampToISO } = require('../data-conversion/timestamp')
 const { deepCopyObject } = require('../../common/utils/copy')
+const getError = require('../../common/error')
 
 function _arrayWithCount(a, count) {
   const _map = a.map
@@ -41,8 +42,8 @@ const read = (executeSelectCQN, executeStreamCQN) => (model, dbc, query, req) =>
   const isoTs = timestampToISO(timestamp)
 
   if (query._streaming) {
-    if (!query.SELECT || (query.SELECT && (!query.SELECT.columns || query.SELECT.columns.length !== 1))) {
-      req.reject(400)
+    if (!query.SELECT || (query.SELECT && !query.SELECT.columns)) {
+      throw getError(500, 'Invalid SELECT statement for streaming')
     }
     return executeStreamCQN(model, dbc, query, user, locale, isoTs)
   }

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

@@ -112,9 +112,11 @@ const fioriGenericActivate = async function (req) {
     req.query.SELECT.from.ref.length > 2 ||
     !isDraftRootEntity(this.model.definitions, ensureNoDraftsSuffix(req.target.name))
   ) {
-    req.reject(400)
+    req.reject(400, 'Action "draftActivate" can only be called on the root draft entity')
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const { draftData, activeData, adminData } = await _draftCompositionTree(this, req)
 
   if (!draftData) req.reject(404)

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

@@ -78,6 +78,7 @@ const _getRoot = req => {
 }
 
 const _getDraftDataFromExistingDraft = async (req, root, isBoundAction) => {
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
   if (!root) return []
   if (root?.IsActiveEntity === false) {
     const query = _getSelectDraftDataCqn(root.entityName, root.where)

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

@@ -70,9 +70,11 @@ const _select = async (lockRecordCQN, draftExistsCQN, selectCQNs, req, dbtx) =>
  */
 const fioriGenericEdit = async function (req) {
   if (!isActiveEntityRequested(req.query.SELECT.where || [])) {
-    req.reject(400)
+    req.reject(400, 'Action "draftEdit" can only be called on the active entity')
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const { definitions } = this.model
 
   // TODO replace with generic where filter

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

@@ -54,6 +54,8 @@ const fioriGenericNew = async function (req, next) {
     return onDraftActivate(req, next)
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const navigationToMany = isNavigationToMany(req)
 
   const adminDataCQN = navigationToMany

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

@@ -61,6 +61,8 @@ const _joinDraftAdministrativeData = (selectResolved, target) => {
 const fioriGenericPatch = async function (req) {
   if (req.data.IsActiveEntity === true) req.reject(400, 'Patch can only be applied to a draft entity')
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const dbtx = cds.tx(req)
 
   const selectResolved = cqn2cqn4sql(_getSelectCQN(req), this.model)

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

@@ -16,6 +16,8 @@ const fioriGenericPrepare = async function (req) {
     req.reject(400, 'Action "draftPrepare" can only be called on a draft entity')
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const target = ensureDraftsSuffix(req.target.name)
   const columns = getColumns(this.model.definitions[ensureNoDraftsSuffix(req.target.name)], {
     keysOnly: true,

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

@@ -18,6 +18,7 @@ const {
 } = require('../utils/handler')
 const { deleteCondition, readAndDeleteKeywords, removeIsActiveEntityRecursively } = require('../utils/where')
 const { adaptStreamCQN } = require('../../cds-services/adapter/odata-v4/utils/stream')
+const getError = require('../../common/error')
 
 const _findSubselect = where => {
   return where.find((e, i) => {
@@ -1182,7 +1183,7 @@ const _getOriginalColumns = req => {
   const originalColumns = {}
   // expanded columns are handled generically in db
   for (const c of req.query.SELECT.columns) {
-    originalColumns[c.ref ? c.ref[c.ref.length - 1] : c.as || c] = true
+    originalColumns[c.as || (c.ref && c.ref[c.ref.length - 1]) || c] = true
   }
 
   return originalColumns
@@ -1226,6 +1227,9 @@ const _postProcess = (result, req, cqnScenario, deleteLastChangeDateTime) => {
     }
   }
 
+  if (result.HasActiveEntity === null) result.HasActiveEntity = false
+  if (result.HasDraftEntity === null) result.HasDraftEntity = false
+  if (result.IsActiveEntity === null) result.IsActiveEntity = false
   return result
 }
 
@@ -1266,6 +1270,8 @@ const _adaptColumns4readAfterWrite = (req, cqnScenario, query4sql) => {
  * @param req
  */
 const fioriGenericRead = async function (req) {
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const query = req.query
   const originalFrom = _copyCQNPartial(query.SELECT.from)
 
@@ -1298,7 +1304,7 @@ const fioriGenericRead = async function (req) {
     cqnScenario = _generateCQN(reqClone, nonDraftColumns, originalFrom, this.model)
   }
 
-  if (!cqnScenario) req.reject(400)
+  if (!cqnScenario) throw getError(501)
 
   // ensure base columns for calculation are selected in draft admin expand
   _adaptDraftAdminExpand(cqnScenario.cqn)

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

@@ -109,6 +109,8 @@ const _shouldReadOverDraft = (req, definitions) => {
  * @returns {Promise<Array>}
  */
 const _readOverDraftHandler = async function (req, next) {
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const definitions = this.model.definitions
 
   // determine whether the request is handled here (read over draft handler),