@sap/cds 7.8.2 → 7.9.0

package/libx/_runtime/{cds-services/services → common}/utils/differ.js

@@ -1,15 +1,15 @@
-const cds = require('../../../cds')
+const cds = require('../../cds')
 const { SELECT } = cds.ql
 
 const { compareJson } = require('./compareJson')
-const { selectDeepUpdateData } = require('../../../common/composition')
-const { ensureDraftsSuffix } = require('../../../fiori/utils/handler')
+const { selectDeepUpdateData } = require('../composition')
+const { ensureDraftsSuffix } = require('../../fiori/utils/handler')
 
-const { DRAFT_COLUMNS_MAP } = require('../../../common/constants/draft')
-const { cqn2cqn4sql, convertPathExpressionToWhere } = require('../../../common/utils/cqn2cqn4sql')
-const { revertData } = require('../../../common/utils/resolveView')
-const { removeIsActiveEntityRecursively } = require('../../../fiori/utils/where')
-const { enrichDataWithKeysFromWhere } = require('../../../common/utils/keys')
+const { DRAFT_COLUMNS_MAP } = require('../constants/draft')
+const { cqn2cqn4sql, convertPathExpressionToWhere } = require('./cqn2cqn4sql')
+const { revertData } = require('./resolveView')
+const { removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
+const { enrichDataWithKeysFromWhere } = require('./keys')
 
 module.exports = class Differ {
   constructor(srv) {

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

@@ -0,0 +1,29 @@
+const getTemplate = require('./template')
+const templateProcessor = require('./templateProcessor')
+
+const _pick = element => {
+  return element._type in { 'cds.Decimal': 1, 'cds.Integer64': 1 }
+}
+
+const _processorFn = () => elementInfo => {
+  const { row, key } = elementInfo
+  if (typeof row?.[key] !== 'number') return
+  row[key] = `${row[key]}`
+}
+
+const ensureIEEE754 = (target, service, result) => {
+  const { model } = service
+  if (!target || !result || !model || !model.definitions[target.name]) return
+
+  const template = getTemplate('ensureIEEE754', service, target, { pick: _pick })
+  if (template.elements.size === 0) return
+
+  if (typeof result === 'object' && result != null) {
+    const processFn = _processorFn()
+    for (const row of Array.isArray(result) ? result : [result]) {
+      templateProcessor({ processFn, row, template })
+    }
+  }
+}
+
+module.exports = ensureIEEE754

package/libx/_runtime/common/utils/{postProcessing.js → postProcess.js}

@@ -89,6 +89,4 @@ const postProcess = (query, result, service, onlySelectAliases = false) => {
   return revertData(result, transition, service)
 }
 
-module.exports = {
-  postProcess
-}
+module.exports = postProcess

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

@@ -714,21 +714,6 @@ const resolveView = (query, model, service) => {
   return newQuery
 }
 
-/**
- * Restores the link of req.data and req.query in case req.query was overwritten.
- * Only applicable for UPDATEs and INSERTs.
- *
- * @param {*} req
- */
-const restoreLink = req => {
-  if (req.query.INSERT?.entries) {
-    if (Array.isArray(req.query.INSERT.entries)) req.data = req.query.INSERT.entries[0]
-    else req.data = req.query.INSERT.entries
-  } else if (req.query.UPDATE?.data) {
-    req.data = req.query.UPDATE.data
-  }
-}
-
 /**
  * Retrieves the actual query target by evaluating the created transitions.
  * @param {*} q - the resolved query
@@ -753,6 +738,5 @@ module.exports = {
   getDBTable,
   resolveView,
   getTransition,
-  restoreLink,
   revertData
 }

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

@@ -42,7 +42,7 @@ const _resolveTarget = (ref, target) => {
   const element = target.elements[_ref]
   if (element) return element._target
 
-  throw cds.error(`Navigation property '${_ref}' is not defined in '${target.name}'`, { code: 400 })
+  throw cds.error(`Navigation property "${_ref}" is not defined in ${target.name}`, { code: 400 })
 }
 
 const rewriteExpandAsterisk = (columns, target) => {

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

@@ -1,4 +1,4 @@
-const { computeColumnsToBeSearched } = require('../../../../libx/_runtime/cds-services/services/utils/columns')
+const { computeColumnsToBeSearched } = require('./columns')
 const searchToLike = require('./searchToLike')
 const { getEntityNameFromCQN } = require('./entityFromCqn')
 

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

@@ -3,7 +3,9 @@ const { ensureNoDraftsSuffix, ensureUnlocalized } = require('../../fiori/utils/h
 const { isDuplicate } = require('./rewriteAsterisks')
 
 const _addColumn = (name, type, columns, url) => {
+  // we do not want to return these additional odata properties with new adapter
   if (cds.env.features.odata_new_adapter) return
+
   if (typeof type === 'object') {
     let mType = type['='].replaceAll(/\./g, '_')
     const ref = {
@@ -27,6 +29,7 @@ const _addColumn = (name, type, columns, url) => {
 
 const _addColumns = (target, columns) => {
   if (cds.env.features.odata_new_adapter) return
+
   for (const k in target.elements) {
     const el = target.elements[k]
     if (el['@Core.MediaType']) {
@@ -35,6 +38,7 @@ const _addColumns = (target, columns) => {
   }
 }
 
+// eslint-disable-next-line complexity
 const handleStreamProperties = (target, columns, model) => {
   if (!target || !model || !columns) return
 
@@ -44,11 +48,14 @@ const handleStreamProperties = (target, columns, model) => {
     const name = col.ref && col.ref[col.ref.length - 1]
     const element = name && target.elements[name]
     const type = element && element.type
-    const mediaType = element && element['@Core.MediaType']
+    const mediaType = element?.['@Core.MediaType']
+
+    // new adapter handles urls correctly and just returns them as they are, okra handles them wrongly due to wrong EDM generation by compiler
+    const ignoreMediaType = cds.env.features.odata_new_adapter && mediaType && element['@Core.IsURL']
 
     if (col === '*') {
       _addColumns(target, columns)
-    } else if (col.ref && (type === 'cds.LargeBinary' || mediaType)) {
+    } else if (col.ref && (type === 'cds.LargeBinary' || (mediaType && !ignoreMediaType))) {
       if (mediaType) {
         _addColumn(name, mediaType, columns, element['@Core.IsURL'])
         columns.splice(index, 1)

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

@@ -75,7 +75,7 @@ const _cleanup = (row, definition, cleanupNull, cleanupStruct, errors, prefix =
         _cleanup(row[key], definition, cleanupNull, cleanupStruct, errors, [...prefix, key])
       } else {
         if (errors) {
-          errors.push(getError(400, 'Property ' + key + ' does not exist in ' + definition.name))
+          errors.push(getError(400, `Property "${key}" does not exist in ${definition.name}`))
         }
         delete row[key]
       }

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

@@ -1024,7 +1024,7 @@ class JoinCQNFromExpanded {
     // Add table alias or name to handle cases, where joined tables have same column names
     if (this._isElement(column.ref, entity)) {
       const alias = tableAlias || ensureNoDraftsSuffix(entity.name)
-      aliasedElement.ref = alias ? [alias, column.ref[0]] : [column.ref[0]]
+      aliasedElement.ref = alias ? [alias, ...column.ref] : [...column.ref]
     }
 
     if (skipMapping) return aliasedElement
@@ -1050,8 +1050,10 @@ class JoinCQNFromExpanded {
   }
 
   _isElement(ref, entity) {
-    if (!ref || ref.length !== 1) return false
-
+    if (!ref) return false
+    if (ref.length > 1) {
+      return entity.elements[ref[0]]?.isAssociation
+    }
     // Normal element
     if (entity.elements[ref[0]]) return true
 

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

@@ -1,16 +1,13 @@
 const cds = require('../../cds')
 const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { generateAliases } = require('../utils/generateAliases')
-const { restoreLink } = require('../../common/utils/resolveView')
 
-const _isLinked = req => {
+const _restoreLink = req => {
   if (req.query.INSERT?.entries) {
-    if (Array.isArray(req.query.INSERT.entries)) return req.data === req.query.INSERT.entries[0]
-    return req.data === req.query.INSERT.entries
+    return (req.data = Array.isArray(req.query.INSERT.entries) ? req.query.INSERT.entries[0] : req.query.INSERT.entries)
   }
-
   if (req.query.UPDATE?.data) {
-    return req.data === req.query.UPDATE.data
+    return (req.data = req.query.UPDATE.data)
   }
 }
 
@@ -26,19 +23,16 @@ function handler(req) {
     return
   }
 
-  const streaming = cds.env.features.stream_compat && req.query._streaming
-
-  // for restore link to req.data
-  const linked = _isLinked(req)
+  const _streaming = cds.env.features.stream_compat && req.query._streaming
 
   // convert to sql cqn
   req.query = cqn2cqn4sql(req.query, this.model, { service: this })
 
-  // REVISIT: should not be necessary
   // restore link to req.data
-  if (linked) restoreLink(req)
+  _restoreLink(req)
+
+  if (_streaming) req.query._streaming = _streaming
 
-  if (cds.env.features.stream_compat && streaming) req.query._streaming = streaming
   generateAliases(req.query)
 }
 

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

@@ -10,7 +10,7 @@ const {
 } = require('../utils/handler')
 const { readAndDeleteKeywords, isActiveEntityRequested, getKeyData } = require('../utils/where')
 const { isDraftRootEntity } = require('../../fiori/utils/csn')
-const { getColumns } = require('../../cds-services/services/utils/columns')
+const { getColumns } = require('../../common/utils/columns')
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getRootCQN = (context, requestActiveData) => {

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

@@ -3,7 +3,7 @@ const getLockInfo = require('../utils/lockInfo')
 const { INSERT, SELECT, DELETE } = cds.ql
 
 const { getCompositionTree } = require('../../common/composition')
-const { getColumns } = require('../../cds-services/services/utils/columns')
+const { getColumns } = require('../../common/utils/columns')
 const { draftIsLocked, ensureDraftsSuffix, ensureNoDraftsSuffix, getSubCQNs } = require('../utils/handler')
 const { isActiveEntityRequested } = require('../utils/where')
 

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

@@ -3,7 +3,7 @@ const { SELECT } = cds.ql
 
 const { isActiveEntityRequested } = require('../utils/where')
 const { ensureDraftsSuffix, ensureNoDraftsSuffix } = require('../utils/handler')
-const { getColumns } = require('../../cds-services/services/utils/columns')
+const { getColumns } = require('../../common/utils/columns')
 
 /**
  * Generic Handler for PreparationAction requests.

package/libx/_runtime/fiori/lean-draft.js

@@ -5,6 +5,9 @@ const { getKeyData } = require('./utils/where')
 
 const { getPageSize, commonGenericPaging } = require('../common/generic/paging')
 const { handler: commonGenericSorting } = require('../common/generic/sorting')
+const { addEtagColumns } = require('../common/utils/etag')
+
+const { calculateLocationHeader } = require('../../odata/utils')
 
 const LOG = cds.log('fiori|drafts')
 const original = Symbol('original')
@@ -73,10 +76,10 @@ const LOCK_TIMEOUT = {
 }
 
 const reject_bypassed_draft = req => {
-  const msg =
+  const message =
     !cds.profiles?.includes('production') &&
     '`cds.env.fiori.bypass_draft` must be enabled or the entity must be annotated with `@odata.draft.bypass` to support the directly modification of active instances.'
-  return req.reject(501, msg)
+  return req.reject({ code: 501, statusCode: 501, message })
 }
 
 const DRAFT_ELEMENTS = new Set([
@@ -322,8 +325,10 @@ cds.ApplicationService.prototype.handle = async function (req) {
     return result
   }
 
+  if (req.event === 'draftEdit') req.event = 'EDIT'
+
   if (req.event === 'NEW' || req.event === 'CANCEL' || req.event === 'draftPrepare') {
-    if (req.event === 'draftPrepare' && draftParams.IsActiveEntity) req.reject(400)
+    if (req.event === 'draftPrepare' && draftParams.IsActiveEntity) req.reject({ code: 400, statusCode: 400 })
     if (req.event === 'NEW' && req.data?.IsActiveEntity === true) {
       if (!cds.env.fiori.bypass_draft && !req.target['@odata.draft.bypass']) return reject_bypassed_draft(req)
       const containsDraftRoot =
@@ -331,7 +336,7 @@ cds.ApplicationService.prototype.handle = async function (req) {
           '@Common.DraftRoot.ActivationAction'
         ]
 
-      if (!containsDraftRoot) req.reject(403, 'DRAFT_MODIFICATION_ONLY_VIA_ROOT')
+      if (!containsDraftRoot) req.reject({ code: 403, statusCode: 403, message: 'DRAFT_MODIFICATION_ONLY_VIA_ROOT' })
 
       const isDirectAccess = typeof req.query.INSERT.into === 'string' || req.query.INSERT.into.ref?.length === 1
       const data = Object.assign({}, req.data) // IsActiveEntity is not enumerable
@@ -355,7 +360,7 @@ cds.ApplicationService.prototype.handle = async function (req) {
         rootHasDraft = await SELECT.one([1]).from({ ref: draftsRootRef }).where(keyData)
       }
 
-      if (rootHasDraft) req.reject(409, 'DRAFT_ALREADY_EXISTS')
+      if (rootHasDraft) req.reject({ code: 409, statusCode: 409, message: 'DRAFT_ALREADY_EXISTS' })
 
       const cqn = INSERT.into(query.INSERT.into).entries(data)
       await run(cqn, { event: 'CREATE' })
@@ -393,8 +398,8 @@ cds.ApplicationService.prototype.handle = async function (req) {
     const draft = await draftQuery
     const inProcessByUser = draft?.DraftAdministrativeData?.InProcessByUser
     if (inProcessByUser && inProcessByUser !== cds.context.user.id)
-      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [inProcessByUser])
-    if (draft) req.reject(403, 'DRAFT_ACTIVE_DELETE_FORBIDDEN_DRAFT_EXISTS')
+      req.reject({ code: 403, statusCode: 403, message: 'DRAFT_LOCKED_BY_ANOTHER_USER', args: [inProcessByUser] })
+    if (draft) req.reject({ code: 403, statusCode: 403, message: 'DRAFT_ACTIVE_DELETE_FORBIDDEN_DRAFT_EXISTS' })
     await run(query)
     return req.data
   }
@@ -405,11 +410,15 @@ cds.ApplicationService.prototype.handle = async function (req) {
     // It would be great if we'd have a SELECT ** to deeply expand the entity (along compositions), that should
     // be implemented in expand implementation.
     if (req.query.SELECT.from.ref.length > 1 || draftParams.IsActiveEntity !== false) {
-      req.reject(400, 'Action "draftActivate" can only be called on the root draft entity')
+      req.reject({
+        code: 400,
+        statusCode: 400,
+        message: 'Action "draftActivate" can only be called on the root draft entity'
+      })
     }
 
     if (req.target._etag && !req.headers['if-match'] && !req.headers['if-none-match']) {
-      req.reject(428)
+      req.reject({ code: 428, statusCode: 428 })
     }
 
     const targetDraft = req.target.drafts
@@ -428,9 +437,15 @@ cds.ApplicationService.prototype.handle = async function (req) {
           { ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] }
         ])
     )
-    if (!res) req.reject(_etagValidationType ? 412 : { code: 'DRAFT_NOT_EXISTING', status: 404 })
+    if (!res)
+      req.reject(_etagValidationType ? { code: 412, statusCode: 412 } : { code: 'DRAFT_NOT_EXISTING', statusCode: 404 })
     if (res.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id) {
-      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [res.DraftAdministrativeData?.InProcessByUser])
+      req.reject({
+        code: 403,
+        statusCode: 403,
+        message: 'DRAFT_LOCKED_BY_ANOTHER_USER',
+        args: [res.DraftAdministrativeData?.InProcessByUser]
+      })
     }
     const DraftAdministrativeData_DraftUUID = res.DraftAdministrativeData_DraftUUID
     delete res.DraftAdministrativeData_DraftUUID
@@ -469,12 +484,21 @@ cds.ApplicationService.prototype.handle = async function (req) {
       // REVISIT: needs reworking for new adapter, especially re $batch
       if (req._?.odataRes) {
         req._?.odataRes?.setStatusCode(201, { overwrite: true })
-      } else if (req.http?.res) {
-        req.http.res.status(201)
+      } else if (req.res) {
+        req.res.status(201)
       }
     }
 
-    return Object.assign(result, { IsActiveEntity: true })
+    if (cds.env.features.odata_new_adapter) {
+      const read_result = await _readAfterDraftAction.bind(this)({ req, payload: res, action: 'draftActivate' })
+      req.res.set(
+        'location',
+        '../' + calculateLocationHeader(req.target, this, read_result || { ...res, IsActiveEntity: true })
+      )
+      return read_result
+    } else {
+      return Object.assign(result, { IsActiveEntity: true })
+    }
   }
 
   if (req.target.actions?.[req.event] && draftParams.IsActiveEntity === false) {
@@ -484,27 +508,35 @@ cds.ApplicationService.prototype.handle = async function (req) {
     rootQuery.SELECT.one = true
     rootQuery.SELECT.from = { ref: [query.SELECT.from.ref[0]] }
     const root = await cds.run(rootQuery)
-    if (!root) req.reject(404)
-    if (root.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id) req.reject(403)
+    if (!root) req.reject({ code: 404, statusCode: 404 })
+    if (root.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id) {
+      req.reject({ code: 403, statusCode: 403 })
+    }
     const _req = _newReq(req, query, draftParams, { event: req.event })
     const result = await handle(_req)
     return result
   }
 
   if (req.event === 'PATCH') {
-    if (!('IsActiveEntity' in draftParams)) req.reject(501)
+    if (!('IsActiveEntity' in draftParams)) req.reject({ code: 501, statusCode: 501 })
 
     if (draftParams.IsActiveEntity === false) {
       LOG.debug('patch draft')
-      if (req.target?.name.endsWith('DraftAdministrativeData')) req.reject(405)
+      if (req.target?.name.endsWith('DraftAdministrativeData')) req.reject({ code: 405, statusCode: 405 })
       const draftsRef = _redirectRefToDrafts(query.UPDATE.entity.ref, this.model)
       const res = await SELECT.one.from({ ref: draftsRef }).columns('DraftAdministrativeData_DraftUUID', {
         ref: ['DraftAdministrativeData'],
         expand: [{ ref: ['InProcessByUser'] }]
       })
-      if (!res) req.reject(404)
-      if (res.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id)
-        req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [res.DraftAdministrativeData?.InProcessByUser])
+      if (!res) req.reject({ code: 404, statusCode: 404 })
+      if (res.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id) {
+        req.reject({
+          code: 403,
+          statusCode: 403,
+          message: 'DRAFT_LOCKED_BY_ANOTHER_USER',
+          args: [res.DraftAdministrativeData?.InProcessByUser]
+        })
+      }
       await UPDATE('DRAFT.DraftAdministrativeData')
         .data({
           InProcessByUser: req.user.id,
@@ -527,12 +559,12 @@ cds.ApplicationService.prototype.handle = async function (req) {
     const entityRef = query.UPDATE.entity.ref
 
     if (!this.model.definitions[entityRef[0].id]['@Common.DraftRoot.ActivationAction']) {
-      req.reject(403, 'DRAFT_MODIFICATION_ONLY_VIA_ROOT')
+      req.reject({ code: 403, statusCode: 403, message: 'DRAFT_MODIFICATION_ONLY_VIA_ROOT' })
     }
 
     const draftsRef = _redirectRefToDrafts(entityRef, this.model)
     const hasDraft = !!(await SELECT.one([1]).from({ ref: [draftsRef[0]] }))
-    if (hasDraft) req.reject(409, 'DRAFT_ALREADY_EXISTS')
+    if (hasDraft) req.reject({ code: 409, statusCode: 409, message: 'DRAFT_ALREADY_EXISTS' })
 
     await run(query)
     return req.data
@@ -1018,7 +1050,13 @@ function _cleansed(query, model) {
     const target = query._target
     const q = cds.ql.clone(query)
 
-    const ref = q.SELECT?.from.ref || q.UPDATE?.entity.ref || q.INSERT?.into.ref || q.DELETE?.from.ref
+    if (q.SELECT?.from.SELECT) q.SELECT.from = _cleanseQuery(q.SELECT?.from, draftParams, model)
+    const ref =
+      q.SELECT?.from.SELECT?.from.ref ||
+      q.SELECT?.from.ref ||
+      q.UPDATE?.entity.ref ||
+      q.INSERT?.into.ref ||
+      q.DELETE?.from.ref
     const cqn = q.SELECT || q.UPDATE || q.INSERT || q.DELETE
 
     if (ref) {
@@ -1028,7 +1066,7 @@ function _cleansed(query, model) {
         if (!entity?.drafts) return r
         return r.where ? { ...r, where: _cleanseWhere(r.where, draftParams, DRAFT_ELEMENTS) } : r
       })
-      if (q.SELECT) q.SELECT.from = { ...q.SELECT.from, ref: cleansedRef }
+      if (q.SELECT) q.SELECT.from = q.SELECT.from.SELECT ? q.SELECT.from : { ...q.SELECT.from, ref: cleansedRef }
       else if (q.DELETE) q.DELETE.from = { ...q.DELETE.from, ref: cleansedRef }
       else if (q.UPDATE) q.UPDATE.entity = { ...q.UPDATE.entity, ref: cleansedRef }
       else if (q.INSERT) q.INSERT.into = { ...q.INSERT.into, ref: cleansedRef }
@@ -1175,11 +1213,11 @@ function expandStarStar(target, recursion = new Map()) {
 async function onNew(req) {
   LOG.debug('new draft')
   if (req.target.actives['@Capabilities.InsertRestrictions.Insertable'] === false || req.target.actives['@readonly'])
-    req.reject(405)
+    req.reject({ code: 405, statusCode: 405 })
   const isDirectAccess = typeof req.query.INSERT.into === 'string' || req.query.INSERT.into.ref?.length === 1
   // Only allowed for pseudo draft roots (entities with this action)
   if (isDirectAccess && !req.target.actives['@Common.DraftRoot.ActivationAction'])
-    req.reject(403, 'DRAFT_MODIFICATION_ONLY_VIA_ROOT')
+    req.reject({ code: 403, statusCode: 403, message: 'DRAFT_MODIFICATION_ONLY_VIA_ROOT' })
 
   _cleanUpOldDrafts(this, req.tenant)
 
@@ -1192,9 +1230,14 @@ async function onNew(req) {
         { ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] }
       ])
       .where(req.query.INSERT.into.ref[0].where)
-    if (!rootData) req.reject(404)
+    if (!rootData) req.reject({ code: 404, statusCode: 404 })
     if (rootData.DraftAdministrativeData?.InProcessByUser !== req.user.id)
-      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [rootData.DraftAdministrativeData.InProcessByUser])
+      req.reject({
+        code: 403,
+        statusCode: 403,
+        message: 'DRAFT_LOCKED_BY_ANOTHER_USER',
+        args: [rootData.DraftAdministrativeData.InProcessByUser]
+      })
     DraftUUID = rootData.DraftAdministrativeData_DraftUUID
   }
   const timestamp = cds.context.timestamp.toISOString() // REVISIT: toISOString should be done on db layer
@@ -1251,7 +1294,11 @@ async function onEdit(req) {
   // use symbol for _draftParams
   const draftParams = req.query[DRAFT_PARAMS]
   if (req.query.SELECT.from.ref.length > 1 || draftParams.IsActiveEntity !== true) {
-    req.reject(400, 'Action "draftEdit" can only be called on the root active entity')
+    req.reject({
+      code: 400,
+      statusCode: 400,
+      message: 'Action "draftEdit" can only be called on the root active entity'
+    })
   }
 
   if (
@@ -1259,10 +1306,10 @@ async function onEdit(req) {
     req.target['@insertonly'] ||
     req.target['@readonly']
   ) {
-    req.reject(405)
+    req.reject({ code: 405, statusCode: 405 })
   }
 
-  if (draftParams.IsActiveEntity !== true) req.reject(400)
+  if (draftParams.IsActiveEntity !== true) req.reject({ code: 400, statusCode: 400 })
 
   _cleanUpOldDrafts(this, req.tenant)
 
@@ -1337,8 +1384,8 @@ async function onEdit(req) {
       await this.run(activeLockCQN)
     } catch (e) {
       const draft = await this.run(existingDraft)
-      if (draft) req.reject(409, 'DRAFT_ALREADY_EXISTS')
-      req.reject(409, 'ENTITY_LOCKED')
+      if (draft) req.reject({ code: 409, statusCode: 409, message: 'DRAFT_ALREADY_EXISTS' })
+      req.reject({ code: 409, statusCode: 409, message: 'ENTITY_LOCKED' })
     }
 
     const cqns = [
@@ -1366,12 +1413,12 @@ async function onEdit(req) {
     ])
   }
 
-  if (!res) req.reject(404)
+  if (!res) req.reject({ code: 404, statusCode: 404 })
   const preserveChanges = req.data?.PreserveChanges
   const inProcessByUser = draft?.DraftAdministrativeData?.InProcessByUser
 
   if (draft) {
-    if (inProcessByUser || preserveChanges) req.reject(409, 'DRAFT_ALREADY_EXISTS')
+    if (inProcessByUser || preserveChanges) req.reject({ code: 409, statusCode: 409, message: 'DRAFT_ALREADY_EXISTS' })
     const keys = {}
     for (const key in req.target.drafts.keys) keys[key] = res[key]
     await _promiseAll([
@@ -1405,11 +1452,20 @@ async function onEdit(req) {
   // REVISIT: needs reworking for new adapter, especially re $batch
   if (req._?.odataRes) {
     req._?.odataRes?.setStatusCode(201, { overwrite: true })
-  } else if (req.http?.res) {
-    req.http.res.status(201)
+  } else if (req.res) {
+    req.res.status(201)
   }
 
-  return { ...res, IsActiveEntity: false } // REVISIT: Flatten?
+  if (cds.env.features.odata_new_adapter) {
+    const read_result = await _readAfterDraftAction.bind(this)({ req, payload: res, action: 'draftEdit' })
+    req.res.set(
+      'location',
+      '../' + calculateLocationHeader(req.target, this, read_result || { ...res, IsActiveEntity: false })
+    )
+    return read_result
+  } else {
+    return { ...res, IsActiveEntity: false } // REVISIT: Flatten?
+  }
 }
 
 async function onCancel(req) {
@@ -1430,7 +1486,7 @@ async function onCancel(req) {
   if (draft) {
     const processByUser = draft.DraftAdministrativeData?.InProcessByUser
     if (processByUser && processByUser !== cds.context.user.id)
-      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [processByUser])
+      req.reject({ code: 403, statusCode: 403, message: 'DRAFT_LOCKED_BY_ANOTHER_USER', args: [processByUser] })
   }
   const queries = !draft ? [] : [this.run(DELETE.from({ ref: req.query.DELETE.from.ref }), req.data)]
   if (draft && req.target['@Common.DraftRoot.ActivationAction'])
@@ -1457,23 +1513,72 @@ async function onPrepare(req) {
   LOG.debug('prepare draft')
   const draftParams = req.query[DRAFT_PARAMS]
   if (req.query.SELECT.from.ref.length > 1 || draftParams.IsActiveEntity !== false) {
-    req.reject(400, 'Action "draftPrepare" can only be called on the root draft entity')
+    req.reject({
+      code: 400,
+      statusCode: 400,
+      message: 'Action "draftPrepare" can only be called on the root draft entity'
+    })
   }
   const where = req.query.SELECT.from.ref[0].where
 
   const draftQuery = SELECT.one
     .from(req.target, d => {
-      d.DraftAdministrativeData(a => a.InProcessByUser)
+      d`.*`, d.DraftAdministrativeData(a => a.InProcessByUser)
     })
-    .columns(entity_keys(req.target))
     .where(where)
   draftQuery[DRAFT_PARAMS] = draftParams
   const data = await draftQuery
-  if (!data) req.reject(404)
+  if (!data) req.reject({ code: 404, statusCode: 404 })
   if (data.DraftAdministrativeData?.InProcessByUser !== req.user.id)
-    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [data.DraftAdministrativeData?.InProcessByUser])
+    req.reject({
+      code: 403,
+      statusCode: 403,
+      message: 'DRAFT_LOCKED_BY_ANOTHER_USER',
+      args: [data.DraftAdministrativeData?.InProcessByUser]
+    })
   delete data.DraftAdministrativeData
-  return { ...data, IsActiveEntity: false }
+  // result must not include DraftAdministrativeData_DraftUUID for plain v4 usage, however required for odata-v2
+  if (data && req.headers?.['x-cds-odata-version'] !== 'v2') {
+    delete data.DraftAdministrativeData_DraftUUID
+  }
+  return { ...data, IsActiveEntity: false, HasDraftEntity: false, HasActiveEntity: data.HasActiveEntity || false }
+}
+
+const _readAfterDraftAction = async function ({ req, payload, action }) {
+  const entity = action === 'draftActivate' ? req.target : req.target.drafts
+
+  // read after write with query options
+  const keys = {}
+  entity.keys.forEach(key => {
+    if (key.name === 'IsActiveEntity' || key.isAssociation || key.virtual) return
+    keys[key.name] = payload[key.name]
+  })
+  const read = SELECT.one.from(entity, keys)
+  if (req.req.query.$select || req.req.query.$expand) {
+    const queryOptions = []
+    if (req.req.query.$select) queryOptions.push(`$select=${req.req.query.$select}`)
+    if (req.req.query.$expand) queryOptions.push(`$expand=${req.req.query.$expand}`)
+    read.columns(cds.odata.parse(`/X?${queryOptions.join('&')}`).SELECT.columns)
+    // ensure keys are always selected
+    Object.keys(keys).forEach(key => {
+      if (!read.SELECT.columns.some(c => c.ref?.[0] === key)) read.SELECT.columns.push({ ref: [key] })
+    })
+    // also ensure selection of etag columns
+    addEtagColumns(read.SELECT.columns, entity)
+  }
+
+  try {
+    const read_result = await this.run(read)
+    // result must not include DraftAdministrativeData_DraftUUID for plain v4 usage, however required for odata-v2
+    if (read_result && req.headers?.['x-cds-odata-version'] !== 'v2') {
+      delete read_result.DraftAdministrativeData_DraftUUID
+    }
+    return read_result
+  } catch (err) {
+    if (!(Number(err.code) in { 401: 1, 403: 1, 404: 1, 405: 1 })) throw err
+    // it's important to return null if one of the above accepted errors occurs
+    return null
+  }
 }
 
 module.exports = {