@sap/cds 6.8.4 → 7.0.1

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

@@ -69,6 +69,11 @@ class FunctionBuilder extends BaseBuilder {
     const functionName = this._functionName()
     const args = this._functionArgs()
 
+    if (this._obj.func === 'indexof') {
+      this._handleIndexof(args, functionName)
+      return
+    }
+
     if (!args) {
       // > arg-less func such as current_date
       this._outputObj.sql.push(functionName)
@@ -114,6 +119,17 @@ class FunctionBuilder extends BaseBuilder {
     this._handleLikewiseFunc(args)
   }
 
+  _handleIndexof(args, funcName) {
+    this._outputObj.sql.push('(')
+    this._outputObj.sql.push(funcName, '(')
+    if (typeof args === 'string') this._outputObj.sql.push(args)
+    else this._addFunctionArgs(args)
+    this._outputObj.sql.push(')')
+    this._outputObj.sql.push('-')
+    this._outputObj.sql.push('1')
+    this._outputObj.sql.push(')')
+  }
+
   _handleLikewiseFunc(args) {
     const functionName = this._functionName()
     const not = functionName.startsWith('not') ? 'NOT ' : ''
@@ -193,12 +209,8 @@ class FunctionBuilder extends BaseBuilder {
         res.push(sql)
         this._outputObj.values.push(...values)
       } else if (Object.prototype.hasOwnProperty.call(arg, 'val')) {
-        if (typeof arg.val === 'number' && !this._parameterizedNumbers) {
-          res.push(arg.val)
-        } else {
-          res.push(this._options.placeholder)
-          this._outputObj.values.push(arg.val)
-        }
+        res.push(this._options.placeholder)
+        this._outputObj.values.push(arg.val)
       } else if (arg.list) {
         this._addFunctionArgs(arg.list, true)
         // _addFunctionArgs adds the arguments list already to the output object

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

@@ -259,6 +259,7 @@ class InsertBuilder extends BaseBuilder {
   _getValue(column, { entry, flattenColumn, insertAnnotatedColumns }) {
     let val = entry
     if (!flattenColumn && this.uuidKeys.includes(column)) {
+      if (this._UPSERT) return undefined
       val = cds.utils.uuid()
     } else {
       for (const key of flattenColumn) {

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

@@ -413,7 +413,7 @@ class SelectBuilder extends BaseBuilder {
   _addRows() {
     if (this._obj.SELECT.limit) {
       if (this._obj.SELECT.limit.rows !== undefined) {
-        // limit (no placeholder for statement caching)
+        // limit (no placeholder for statement caching) - hana does not know how to optimize
         this._outputObj.sql.push('LIMIT', this._obj.SELECT.limit.rows.val)
       } else {
         // rows parameter is mandatory for SQL
@@ -429,12 +429,8 @@ class SelectBuilder extends BaseBuilder {
   _addOffset() {
     // offset
     if (this._obj.SELECT.limit && this._obj.SELECT.limit.offset !== undefined) {
-      if (typeof this._obj.SELECT.limit.offset.val === 'number' && !this._parameterizedNumbers) {
-        this._outputObj.sql.push('OFFSET', this._obj.SELECT.limit.offset.val)
-      } else {
-        this._outputObj.sql.push('OFFSET', '?')
-        this._outputObj.values.push(this._obj.SELECT.limit.offset.val)
-      }
+      this._outputObj.sql.push('OFFSET', '?')
+      this._outputObj.values.push(this._obj.SELECT.limit.offset.val)
     }
   }
 

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

@@ -4,6 +4,7 @@ const getAnnotatedColumns = require('./annotations')
 class UpsertBuilder extends InsertBuilder {
   constructor(obj, options, csn) {
     super(obj, options, csn)
+    this._UPSERT = true
   }
 
   annotatedColumns(entityName, csn) {

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

@@ -1,11 +1,15 @@
 const cds = require('../../cds')
 
 const { ensureNoDraftsSuffix } = require('../../common/utils/draft.js')
+const normalizeTimestamp = require('../../common/utils/normalizeTimestamp')
 
 const _convertDateTimeElement = (value, element) => {
-  value = new Date(value).toISOString()
-  if (element._type === 'cds.DateTime') value = value.replace(/\.\d\d\d/, '')
-  return value
+  switch (element._type) {
+    case 'cds.DateTime':
+      return new Date(value).toISOString().replace(/\.\d\d\d/, '')
+    case 'cds.Timestamp':
+      return normalizeTimestamp(value)
+  }
 }
 
 const _isToConvert = type => type === 'cds.DateTime' || type === 'cds.Timestamp'

package/libx/_runtime/fiori/draft.js

@@ -0,0 +1,2 @@
+const cds = require('../cds')
+module.exports = cds.env.fiori.lean_draft ? require('./lean-draft') : require('./generic')

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

@@ -106,7 +106,9 @@ const _draftCompositionTree = async (service, req) => {
  *
  * @param req
  */
-const fioriGenericActivate = async function (req) {
+const fioriGenericActivate = async function (req, next) {
+  if (!req.target._isDraftEnabled) return next()
+
   if (
     isActiveEntityRequested(req.query.SELECT.from.ref[0].where || []) ||
     req.query.SELECT.from.ref.length > 2 ||
@@ -120,10 +122,9 @@ const fioriGenericActivate = async function (req) {
   const { draftData, activeData, adminData } = await _draftCompositionTree(this, req)
 
   if (!draftData) req.reject(404)
-  if (adminData.InProcessByUser !== req.user.id) {
-    // REVISIT: security log?
+
+  if (adminData.InProcessByUser !== req.user.id)
     req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [adminData.InProcessByUser])
-  }
 
   /*
    * create or update
@@ -146,8 +147,6 @@ const fioriGenericActivate = async function (req) {
 
   // REVISIT: should not be necessary
   r._ = Object.assign(r._, req._)
-  if (req.getUriInfo) r.getUriInfo = () => req.getUriInfo()
-  if (req.getUrlObject) r.getUrlObject = () => req.getUrlObject()
   r._.params = req.params
   r._.query = req.query
 
@@ -178,11 +177,11 @@ const fioriGenericActivate = async function (req) {
 
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
-  req?._?.odataRes?.setStatusCode(201)
+  if (event === 'CREATE') req?._?.odataRes?.setStatusCode(201, { overwrite: true })
 
   return result
 }
 
-module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('draftActivate', entity, fioriGenericActivate)
+module.exports = cds.service.impl(function (srv) {
+  srv.on('draftActivate', '*', fioriGenericActivate)
 })

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

@@ -23,6 +23,7 @@ const PREFIX_DRAFT_COLUMNS = DRAFT_COLUMNS_ADMIN.map(col => ({ ref: ['DRAFT_Draf
 
 const _validateDraft = (req, draftResult, isBoundAction) => {
   if (!draftResult || draftResult.length === 0) req.reject(404)
+
   const draftAdminData = draftResult[0]
 
   // the same user that locked the entity can always delete/update it
@@ -118,7 +119,9 @@ const _addDraftDataFromExistingDraft = async req => {
  * Generic Handler for before NEW requests.
  */
 const _new = async function (req) {
-  if (isNavigationToMany(req)) {
+  if (!req.target._isDraftEnabled) return
+
+  if (isNavigationToMany(req, this.model)) {
     const result = await _addDraftDataFromExistingDraft(req)
 
     // in order to fix corner case where active subitems are created in draft case
@@ -136,6 +139,8 @@ const _new = async function (req) {
  * Generic Handler for before PATCH and UPDATE requests.
  */
 const _patch = async function (req) {
+  if (!req.target._isDraftEnabled) return
+
   const result = await _addDraftDataFromExistingDraft(req)
 
   // no result means that the draft does not exist
@@ -146,6 +151,8 @@ const _patch = async function (req) {
  * Generic Handler for before DELETE and CANCEL requests.
  */
 const _cancel = async function (req) {
+  if (!req.target._isDraftEnabled) return
+
   await _addDraftDataFromExistingDraft(req)
 }
 
@@ -162,20 +169,22 @@ const _allowEntityCollectionOnAction = action => {
   )
 }
 
-const _registerBoundActionHandlers = function (entityName, actions) {
-  if (!actions) return
-
-  const boundActions = Object.values(actions).filter(
-    action =>
-      action.kind === 'action' &&
-      action.name !== 'draftPrepare' &&
-      action.name !== 'draftEdit' &&
-      action.name !== 'draftActivate' &&
-      !_allowEntityCollectionOnAction(action)
-  )
-
-  for (const action of boundActions) {
-    this.before(action.name, entityName, req => _validateDraftBoundAction(req))
+const _registerBoundActionHandlers = function (entities) {
+  for (let entity of entities) {
+    if (!entity.actions) return
+
+    const boundActions = Object.values(entity.actions).filter(
+      action =>
+        action.kind === 'action' &&
+        action.name !== 'draftPrepare' &&
+        action.name !== 'draftEdit' &&
+        action.name !== 'draftActivate' &&
+        !_allowEntityCollectionOnAction(action)
+    )
+
+    for (const action of boundActions) {
+      this.before(action.name, entity.name, req => _validateDraftBoundAction(req))
+    }
   }
 }
 
@@ -183,9 +192,10 @@ _new._initial = true
 _patch._initial = true
 _cancel._initial = true
 
-module.exports = cds.service.impl((srv, entity) => {
-  srv.before('NEW', entity, _new)
-  srv.before('PATCH', entity, _patch)
-  srv.before('CANCEL', entity, _cancel)
-  _registerBoundActionHandlers.call(srv, entity.name, entity.actions)
+module.exports = cds.service.impl(function (srv) {
+  srv.before('NEW', '*', _new)
+  srv.before('PATCH', '*', _patch)
+  srv.before('CANCEL', '*', _cancel)
+  const entities = Object.values(srv.entities || {}).filter(entity => entity._isDraftEnabled)
+  _registerBoundActionHandlers.call(srv, entities)
 })

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

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

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

@@ -8,12 +8,14 @@ const { deleteDraft } = require('../utils/delete')
  *
  * @param req
  */
-const fioriGenericDelete = function (req) {
+const fioriGenericDelete = function (req, next) {
+  if (!req.target._isDraftEnabled) return next()
+
   // 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, fioriGenericDelete)
+module.exports = cds.service.impl(function (srv) {
+  srv.on('DELETE', '*', fioriGenericDelete)
 })

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

@@ -68,7 +68,9 @@ const _select = async (lockRecordCQN, draftExistsCQN, selectCQNs, req, dbtx) =>
  *
  * @param req
  */
-const fioriGenericEdit = async function (req) {
+const fioriGenericEdit = async function (req, next) {
+  if (!req.target._isDraftEnabled) return next()
+
   if (!isActiveEntityRequested(req.query.SELECT.where || [])) {
     req.reject(400, 'Action "draftEdit" can only be called on the active entity')
   }
@@ -123,9 +125,7 @@ const fioriGenericEdit = async function (req) {
   // REVISIT: Use service.read with expand **
   const [draftExists, ...results] = await _select(lockRecordCQN, draftExistsCQN, [...selectCQNs], req, dbtx)
 
-  if (!results[0].length) {
-    req.reject(404)
-  }
+  if (!results[0].length) req.reject(404)
 
   if (draftExists.length) {
     const adminData = await dbtx.run(
@@ -164,11 +164,11 @@ const fioriGenericEdit = async function (req) {
 
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
-  req?._?.odataRes?.setStatusCode(201)
+  req?._?.odataRes?.setStatusCode(201, { overwrite: true })
 
   return results[0][0]
 }
 
-module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('EDIT', entity, fioriGenericEdit)
+module.exports = cds.service.impl(function (srv) {
+  srv.on('EDIT', '*', fioriGenericEdit)
 })

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

@@ -1,22 +1,16 @@
 const cds = require('../../cds')
 
 exports.impl = cds.service.impl(function () {
-  const entities = Object.values(this.entities).filter(entity => entity._isDraftEnabled)
-  if (entities.length === 0) return
-
-  for (const each of entities) {
-    _before(this, each)
-    _new(this, each)
-    _patch(this, each)
-    _cancel(this, each)
-    _edit(this, each)
-    _prepare(this, each)
-    _activate(this, each)
-    _delete(this, each)
-  }
-
-  _readOverDraft(this) // registers an on READ * handler
-  for (const each of entities) _read(this, each) // have to go last
+  _before(this)
+  _new(this)
+  _patch(this)
+  _cancel(this)
+  _edit(this)
+  _prepare(this)
+  _activate(this)
+  _delete(this)
+  _readOverDraft(this)
+  _read(this) // have to go last
 })
 
 const _before = require('../../fiori/generic/before')

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

@@ -49,6 +49,8 @@ const _getInsertDataCQN = (req, draftUUID) => {
  * @param next
  */
 const fioriGenericNew = async function (req, next) {
+  if (!req.target._isDraftEnabled) return next()
+
   if (!req._draftMetadata) {
     // REVISIT: when is this the case?
     return onDraftActivate(req, next)
@@ -60,7 +62,7 @@ const fioriGenericNew = async function (req, next) {
   // Only allowed for pseudo draft roots (entities with this action)
   if (isRoot && !req.target['@Common.DraftRoot.ActivationAction']) req.reject(403, 'DRAFT_MODIFICATION_ONLY_VIA_ROOT')
 
-  const navigationToMany = isNavigationToMany(req)
+  const navigationToMany = isNavigationToMany(req, this.model)
 
   const adminDataCQN = navigationToMany
     ? _getUpdateDraftAdminCQN(req, req.data.DraftAdministrativeData_DraftUUID)
@@ -75,6 +77,6 @@ const fioriGenericNew = async function (req, next) {
   return { ...req.data, IsActiveEntity: false }
 }
 
-module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('NEW', entity, fioriGenericNew)
+module.exports = cds.service.impl(function (srv) {
+  srv.on('NEW', '*', fioriGenericNew)
 })

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

@@ -58,7 +58,9 @@ const _joinDraftAdministrativeData = (selectResolved, target) => {
  *
  * @param req
  */
-const fioriGenericPatch = async function (req) {
+const fioriGenericPatch = async function (req, next) {
+  if (!req.target._isDraftEnabled) return next()
+
   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')
@@ -70,17 +72,18 @@ const fioriGenericPatch = async function (req) {
   const targetName = selectResolved.SELECT.from.ref[selectResolved.SELECT.from.ref.length - 1]
   const alias = selectResolved.SELECT.from.as
   const selectWithAdmin = _joinDraftAdministrativeData(selectResolved, alias || targetName)
+
+  if (req._etagValidationClause) selectWithAdmin.where(removeIsActiveEntityRecursively(req._etagValidationClause))
+
   const results = await dbtx.run(selectWithAdmin)
 
-  if (results.length === 0) req.reject(404)
+  if (results.length === 0) req.reject(req._etagValidationType ? 412 : 404)
 
   const result = results[0]
 
   // Potential timeout scenario supported
-  if (result.draftAdmin_inProcessByUser && result.draftAdmin_inProcessByUser !== req.user.id) {
-    // REVISIT: security log?
-    req.reject(403)
-  }
+  if (result.draftAdmin_inProcessByUser && result.draftAdmin_inProcessByUser !== req.user.id) req.reject(403)
+
   const updateDraftCQN = _getUpdateDraftCQN(req, selectResolved.SELECT.where, {
     ref: [targetName],
     as: alias || targetName
@@ -93,6 +96,6 @@ const fioriGenericPatch = async function (req) {
   return { ...req.data, IsActiveEntity: false }
 }
 
-module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('PATCH', entity, fioriGenericPatch)
+module.exports = cds.service.impl(function (srv) {
+  srv.on('PATCH', '*', fioriGenericPatch)
 })

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

@@ -11,7 +11,9 @@ const { getColumns } = require('../../cds-services/services/utils/columns')
  *
  * @param req
  */
-const fioriGenericPrepare = async function (req) {
+const fioriGenericPrepare = async function (req, next) {
+  if (!req.target._isDraftEnabled) return next()
+
   if (req.query.SELECT.from.ref.length > 1 || isActiveEntityRequested(req.query.SELECT.from.ref[0].where || [])) {
     req.reject(400, 'Action "draftPrepare" can only be called on a draft entity')
   }
@@ -19,6 +21,7 @@ const fioriGenericPrepare = async function (req) {
   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,
     removeIgnore: true,
@@ -26,6 +29,7 @@ const fioriGenericPrepare = async function (req) {
     onlyNames: true
   })
   columns.push({ ref: ['DRAFT.DraftAdministrativeData', 'inProcessByUser'], as: 'draftAdmin_inProcessByUser' })
+
   const select = SELECT.one(target)
     .columns(columns)
     .join('DRAFT.DraftAdministrativeData')
@@ -35,16 +39,19 @@ const fioriGenericPrepare = async function (req) {
       { ref: ['DRAFT.DraftAdministrativeData', 'DraftUUID'] }
     ])
     .where(req.query.SELECT.from.ref[0].where)
+
   const result = await cds.tx(req).run(select)
+
   if (!result) req.reject(404)
-  if (result.draftAdmin_inProcessByUser !== req.user.id) {
-    // REVISIT: security log?
+
+  if (result.draftAdmin_inProcessByUser !== req.user.id)
     req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [result.draftAdmin_inProcessByUser])
-  }
+
   delete result.draftAdmin_inProcessByUser
+
   return result
 }
 
-module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('draftPrepare', entity, fioriGenericPrepare)
+module.exports = cds.service.impl(function (srv) {
+  srv.on('draftPrepare', '*', fioriGenericPrepare)
 })

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

@@ -17,7 +17,7 @@ const {
   filterKeys
 } = require('../utils/handler')
 const { deleteCondition, readAndDeleteKeywords, removeIsActiveEntityRecursively } = require('../utils/where')
-const { adaptStreamCQN } = require('../../cds-services/adapter/odata-v4/utils/stream')
+const { adaptStreamCQN } = require('../utils/stream')
 const getError = require('../../common/error')
 
 const _findSubselect = where => {
@@ -1189,10 +1189,11 @@ const _getOriginalColumns = req => {
   return originalColumns
 }
 
-const _handlerStreaming = (req, query) => {
+const _handlerStreaming = async (req, query) => {
   adaptStreamCQN(query)
   query._streaming = true
-  return cds.tx(req).run(query)
+  const result = await cds.tx(req).run(query)
+  return result
 }
 
 const _postProcess = (result, req, cqnScenario, deleteLastChangeDateTime) => {
@@ -1269,7 +1270,9 @@ const _adaptColumns4readAfterWrite = (req, cqnScenario, query4sql) => {
  *
  * @param req
  */
-const fioriGenericRead = async function (req) {
+const fioriGenericRead = async function (req, next) {
+  if (!req.target._isDraftEnabled) return next()
+
   if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
 
   const query = req.query
@@ -1327,9 +1330,12 @@ const fioriGenericRead = async function (req) {
   _adaptColumns4readAfterWrite(req, cqnScenario, query4sql)
 
   const result = await cds.tx(req).send({ query: cqnScenario.cqn, target: req.target })
+
+  if (result == null && req._etagValidationType === 'if-match') req.reject(412)
+
   return _postProcess(result, reqClone, cqnScenario, enhancedWithLastChangeDateTime)
 }
 
-module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('READ', entity, fioriGenericRead)
+module.exports = cds.service.impl(function (srv) {
+  srv.on('READ', '*', fioriGenericRead)
 })