@sap/cds 6.1.3 → 6.2.1

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

@@ -38,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
 
@@ -67,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/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/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

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

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

@@ -3,30 +3,14 @@ const cds = require('../../cds')
 const { SELECT } = cds.ql
 
 const { isNavigationToMany } = require('../utils/req')
-const { getKeysCondition } = require('../utils/where')
+const { getKeysCondition, removeIsActiveEntityRecursively } = require('../utils/where')
 const { isDraftActivateAction, ensureNoDraftsSuffix, ensureDraftsSuffix, draftIsLocked } = require('../utils/handler')
 
-const { isCustomOperation } = require('../../cds-services/adapter/odata-v4/utils/request')
-
 const { DRAFT_COLUMNS_ADMIN_MAP } = require('../../common/constants/draft')
+const { deepCopyArray } = require('../../common/utils/copy')
 const DRAFT_COLUMNS_ADMIN = Object.keys(DRAFT_COLUMNS_ADMIN_MAP)
 const PREFIX_DRAFT_COLUMNS = DRAFT_COLUMNS_ADMIN.map(col => ({ ref: ['DRAFT_DraftAdministrativeData', col] }))
 
-// copied from adapter/odata-v4/utils/context-object
-const _getTargetEntityName = (service, pathSegments) => {
-  if (isCustomOperation(pathSegments, false)) return
-
-  let navSegmentName
-  let entityName = `${service.name}.${pathSegments[0].getEntitySet().getName()}`
-
-  for (const navSegment of pathSegments.filter(segment => segment.getNavigationProperty() !== null)) {
-    navSegmentName = navSegment.getNavigationProperty().getName()
-    entityName = service.model.definitions[entityName].elements[navSegmentName].target
-  }
-
-  return entityName
-}
-
 /**
  * Provide information about the parent entity, i.e. the entity that has the to-many composition element.
  * Limitation: only works for one key (besides IsActiveEntity)
@@ -36,34 +20,6 @@ const _getTargetEntityName = (service, pathSegments) => {
  * @returns {object}
  * @private
  */
-const _getParent = (req, service) => {
-  // REVISIT: get rid of getUriInfo
-  if (!req.getUriInfo) return
-
-  const segments = req.getUriInfo().getPathSegments()
-  if (segments.length === 1) return
-
-  const parent = {
-    entityName: _getTargetEntityName(service, segments.slice(0, segments.length - 1))
-  }
-
-  const parentKeyPredicates = segments[segments.length - 2].getKeyPredicates()
-  let keyPredicateName, keyPredicateText
-
-  for (const keyPredicate of parentKeyPredicates) {
-    keyPredicateName = keyPredicate.getEdmRef().getName()
-    keyPredicateText = keyPredicate.getText()
-
-    if (keyPredicateName === 'IsActiveEntity') {
-      parent.IsActiveEntity = keyPredicateText === 'true'
-    } else {
-      parent.keyName = keyPredicateName
-      parent.keyValue = keyPredicateText
-    }
-  }
-
-  return parent
-}
 
 const _validateDraft = (req, draftResult, isBoundAction) => {
   if (!draftResult || draftResult.length === 0) req.reject(404)
@@ -102,36 +58,48 @@ const _getSelectDraftDataCqn = (entityName, where) => {
     .where(where)
 }
 
-const _getDraftDataFromExistingDraft = async (req, service, parent = _getParent(req, service)) => {
-  if (parent) {
-    if (parent.IsActiveEntity === false) {
-      const parentWhere = [{ ref: [parent.keyName] }, '=', { val: parent.keyValue }]
-      const query = _getSelectDraftDataCqn(parent.entityName, parentWhere)
-      const result = await cds.tx(req).run(query)
-      return result
+const _getRoot = req => {
+  if (!req.query) return
+  const refObj = req.query.SELECT?.from || req.query.UPDATE?.entity || req.query.INSERT?.into || req.query.DELETE?.from
+  const root = {
+    entityName: ensureDraftsSuffix(refObj.ref[0].id),
+    where: removeIsActiveEntityRecursively(deepCopyArray(refObj.ref[0].where))
+  }
+
+  for (const item of refObj.ref[0].where) {
+    if (item.ref && item.ref[item.ref.length - 1] === 'IsActiveEntity') {
+      const index = refObj.ref[0].where.indexOf(item)
+      root.IsActiveEntity = refObj.ref[0].where[index + 2].val
+      break
     }
+  }
+
+  return root
+}
 
-    return []
+const _getDraftDataFromExistingDraft = async (req, root) => {
+  if (!root) return []
+  if (root?.IsActiveEntity === false) {
+    const query = _getSelectDraftDataCqn(root.entityName, root.where)
+    const result = await cds.tx(req).run(query)
+    return result
   }
 
-  const rootWhere = getKeysCondition(req.target, req.data)
+  const rootWhere = getKeysCondition(req)
   const query = _getSelectDraftDataCqn(ensureNoDraftsSuffix(req.target.name), rootWhere)
   const result = await cds.tx(req).run(query)
   return result
 }
 
-const _addDraftDataFromExistingDraft = async (req, service) => {
-  const parent = _getParent(req, service)
-  const result = await _getDraftDataFromExistingDraft(req, service, parent)
-
-  if (parent) {
-    if (parent.IsActiveEntity === false) {
-      _validateDraft(req, result)
-      _addDraftDataToContext(req, result)
-      return result
-    }
+const _addDraftDataFromExistingDraft = async req => {
+  const root = _getRoot(req)
+  const result = await _getDraftDataFromExistingDraft(req, root)
 
-    return []
+  if (!root) return []
+  if (root.IsActiveEntity === false) {
+    _validateDraft(req, result)
+    _addDraftDataToContext(req, result)
+    return result
   }
 
   if (result && result.length > 0) _validateDraft(req, result)
@@ -147,7 +115,7 @@ const _new = async function (req) {
 
   if (isNavigationToMany(req)) {
     // REVISIT: How can NEW be a navigation to many?
-    const result = await _addDraftDataFromExistingDraft(req, this)
+    const result = await _addDraftDataFromExistingDraft(req)
 
     // in order to fix corner case where active subitems are created in draft case
     if (result.length === 0) req.reject(404)
@@ -165,7 +133,7 @@ const _new = async function (req) {
 const _patchUpdate = async function (req) {
   if (isDraftActivateAction(req)) return
 
-  const result = await _addDraftDataFromExistingDraft(req, this)
+  const result = await _addDraftDataFromExistingDraft(req)
 
   // means that the draft does not exists
   if (result.length === 0) req.reject(404)
@@ -175,11 +143,11 @@ const _patchUpdate = async function (req) {
  * Generic Handler for before DELETE and CANCEL requests.
  */
 const _deleteCancel = async function (req) {
-  await _addDraftDataFromExistingDraft(req, this)
+  await _addDraftDataFromExistingDraft(req)
 }
 
-const _validateDraftBoundAction = async function (req, srv) {
-  const result = await _getDraftDataFromExistingDraft(req, srv)
+const _validateDraftBoundAction = async function (req) {
+  const result = await _getDraftDataFromExistingDraft(req, _getRoot(req))
   const isBoundAction = true
   if (result && result.length > 0) _validateDraft(req, result, isBoundAction)
 }
@@ -196,7 +164,7 @@ const _registerBoundActionHandlers = function (entityName, actions) {
   )
 
   for (const action of boundActions) {
-    this.before(action.name, entityName, req => _validateDraftBoundAction(req, this))
+    this.before(action.name, entityName, req => _validateDraftBoundAction(req))
   }
 }
 

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

@@ -8,10 +8,10 @@ const { deleteDraft } = require('../utils/delete')
  *
  * @param req
  */
-const _handler = function (req) {
+const fioriGenericCancel = function (req) {
   return deleteDraft(req, this)
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('CANCEL', entity, _handler)
+  srv.on('CANCEL', entity, fioriGenericCancel)
 })

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

@@ -8,12 +8,12 @@ const { deleteDraft } = require('../utils/delete')
  *
  * @param req
  */
-const _handler = function (req) {
+const fioriGenericDelete = function (req) {
   // we should call deleteDraft only for draft tables and call next
   // to pass delete of active tables to our general implementation
   return deleteDraft(req, this, true)
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('DELETE', entity, _handler)
+  srv.on('DELETE', entity, fioriGenericDelete)
 })

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

@@ -68,7 +68,7 @@ const _select = async (lockRecordCQN, draftExistsCQN, selectCQNs, req, dbtx) =>
  *
  * @param req
  */
-const _handler = async function (req) {
+const fioriGenericEdit = async function (req) {
   if (!isActiveEntityRequested(req.query.SELECT.where || [])) {
     req.reject(400)
   }
@@ -160,5 +160,5 @@ const _handler = async function (req) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('EDIT', entity, _handler)
+  srv.on('EDIT', entity, fioriGenericEdit)
 })

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

@@ -48,7 +48,7 @@ const _getInsertDataCQN = (req, draftUUID) => {
  * @param req
  * @param next
  */
-const _handler = async function (req, next) {
+const fioriGenericNew = async function (req, next) {
   if (!req._draftMetadata) {
     // REVISIT: when is this the case?
     return onDraftActivate(req, next)
@@ -70,5 +70,5 @@ const _handler = async function (req, next) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('NEW', entity, _handler)
+  srv.on('NEW', entity, fioriGenericNew)
 })