@sap/cds 5.4.6 → 5.5.0

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/applyToCQN.js

@@ -27,11 +27,8 @@ const _createNavGroupBy = pathSegments => {
   let name = pathSegments[0].getNavigationProperty().getName()
   for (let i = 1; i < pathSegments.length; i++) {
     name += pathSegments[i].getProperty()
-      ? '.{' + pathSegments[i].getProperty().getName()
-      : '.{' + pathSegments[i].getNavigationProperty().getName()
-  }
-  for (let i = 1; i < pathSegments.length; i++) {
-    name += '}'
+      ? '.' + pathSegments[i].getProperty().getName()
+      : '.' + pathSegments[i].getNavigationProperty().getName()
   }
   return name
 }

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/createToCQN.js

@@ -1,5 +1,5 @@
-// REVISIT: should be cds.ql
-const { INSERT } = require('../../../statements')
+const cds = require('../../../../cds')
+const { INSERT } = cds.ql
 
 const { getFeatureNotSupportedError } = require('../../../util/errors')
 const { convertUrlPathToCqn } = require('./utils')

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/deleteToCQN.js

@@ -1,13 +1,14 @@
-// REVISIT: should be cds.ql
-const { UPDATE, DELETE } = require('../../../statements')
+const cds = require('../../../../cds')
+const { UPDATE, DELETE } = cds.ql
 
 const { getFeatureNotSupportedError } = require('../../../util/errors')
 const { convertUrlPathToCqn } = require('./utils')
 
-const { ENTITY, NAVIGATION_TO_ONE } = require('../okra/odata-server').uri.UriResource.ResourceKind
+const { ENTITY, NAVIGATION_TO_ONE, SINGLETON } = require('../okra/odata-server').uri.UriResource.ResourceKind
 
 const SUPPORTED_KINDS = {
   [ENTITY]: 1,
+  [SINGLETON]: 1,
   [NAVIGATION_TO_ONE]: 1
 }
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/expandToCQN.js

@@ -191,10 +191,9 @@ const _getItemCQN = (model, name, navigationProperty, expandItem) => {
     orderByToCQN(item, orderBy)
   }
 
-  // REVISIT: expand on hana (window function) breaks without setting dummy limit
   const top = expandItem.getOption(QueryOptions.TOP)
   if (navigationProperty.isCollection())
-    addLimit(item, top != null ? top : Number.MAX_SAFE_INTEGER, expandItem.getOption(QueryOptions.SKIP) || 0)
+    addLimit(item, top != null ? top : null, expandItem.getOption(QueryOptions.SKIP) || 0)
 
   _filter(item, expandItem.getOption(QueryOptions.FILTER))
 

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/index.js

@@ -25,7 +25,6 @@ const deleteToCQN = require('./deleteToCQN')
  */
 module.exports = (component, service, target, data, odataReq, upsert) => {
   const odata2cqn = cds.env.features.odata_new_parser
-  if (odata2cqn && !cds.odata) cds.odata = require('../../../../odata')
 
   switch (component) {
     case DATA_CREATE_HANDLER:

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/selectHelper.js

@@ -70,7 +70,7 @@ const enhanceCqnWithSubSelects = (cqn, pathSegments, csn, SELECT) => {
     let currentCqn
 
     if (isLastElement) {
-      cqn._from(entityName, tableAlias)
+      cqn.SELECT.from = { ref: [entityName], as: tableAlias }
       _addKeysToWhereIfNeeded(cqn, keys, tableAlias)
     } else {
       currentCqn = SELECT.from(`${entityName} as ${tableAlias}`, [1])

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/updateToCQN.js

@@ -1,5 +1,5 @@
-// REVISIT: should be cds.ql
-const { UPDATE } = require('../../../statements')
+const cds = require('../../../../cds')
+const { UPDATE } = cds.ql
 
 const { getFeatureNotSupportedError } = require('../../../util/errors')
 const { isStreaming } = require('../utils/stream')

package/libx/_runtime/cds-services/adapter/odata-v4/odata-to-cqn/utils.js

@@ -79,34 +79,32 @@ const isSameArray = (arr1, arr2) => {
   return arr1.length === arr2.length && arr1.every((element, index) => element === arr2[index])
 }
 
-const _getStructKeys = (elements, prefix) => {
+const _getStructKeys = (key, prefix, joinStructured) => {
   const structKeys = []
-  for (const key in elements) {
-    if (elements[key]._isStructured) {
-      structKeys.push(..._getStructKeys(elements[key].elements, `${prefix}_${elements[key].name}`))
+  for (const keyName in key.elements) {
+    const keyElement = key.elements[keyName]
+    if (keyElement._isStructured) {
+      structKeys.push(..._getStructKeys(keyElement, [...prefix, keyName], joinStructured))
       continue
     }
-    if (elements.isAssociation || elements.isComposition) continue
-
-    structKeys.push(`${prefix}_${key}`)
+    if (keyElement.isAssociation) continue
+    const newKey = joinStructured ? [...prefix, keyName].join('_') : [...prefix, keyName]
+    structKeys.push(newKey)
   }
-
   return structKeys
 }
 
-const getAllKeys = entity => {
+const getAllKeys = (entity, joinStructured = true) => {
   const allKeys = []
-
-  for (const key in entity.keys) {
-    if (entity.keys[key].isAssociation || entity.keys[key].isComposition) continue
-
-    if (entity.keys[key]._isStructured) {
-      allKeys.push(..._getStructKeys(entity.keys[key].elements, entity.keys[key].name))
-      continue
+  if (entity && entity.elements) {
+    // in elements because of aspects
+    for (const keyName in entity.elements) {
+      const key = entity.elements[keyName]
+      if (!key.key || key.isAssociation || key.isComposition) continue
+      if (key._isStructured) allKeys.push(..._getStructKeys(key, [keyName], joinStructured))
+      else allKeys.push(keyName)
     }
-    allKeys.push(entity.keys[key].name)
   }
-
   return allKeys
 }
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/edm/EdmEntityType.js

@@ -107,9 +107,12 @@ class EdmEntityType extends AbstractEdmStructuredType {
    * @returns {boolean} whether this entity type is a media entity type
    */
   hasStream () {
-    if (this.csdlStructuredType.hasStream) return this.csdlStructuredType.hasStream
-
-    return this.getBaseType() ? this.getBaseType().hasStream() : false
+    if (this.csdlStructuredType.hasStream) return true
+    if (this.getBaseType() && this.getBaseType().hasStream()) return true
+    const streamProp = this.csdlStructuredType &&
+      this.csdlStructuredType.properties &&
+      this.csdlStructuredType.properties.find(prop => prop.type && prop.type.namespace + '.' + prop.type.name === 'Edm.Stream')
+    return !!streamProp
   }
 }
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/format/RepresentationKind.js

@@ -162,7 +162,10 @@ class RepresentationKind {
       case ResourceKind.COUNT:
         return RepresentationKind.Kinds.COUNT
       case ResourceKind.VALUE:
-        if (uriInfo.getFinalEdmType().getKind() === EdmTypeKind.ENTITY) return null
+        if (uriInfo.getFinalEdmType().getKind() === EdmTypeKind.ENTITY) {
+          uriInfo.getLastSegment()._isStreamByDollarValue = true
+          return RepresentationKind.Kinds.BINARY
+        }
         return uriInfo.getFinalEdmType() === EdmPrimitiveTypeKind.Binary
           ? RepresentationKind.Kinds.BINARY
           : RepresentationKind.Kinds.PRIMITIVE_VALUE

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/core/OdataRequest.js

@@ -65,6 +65,7 @@ class OdataRequest {
 
     this._deepInsertExpand = []
     this._hasDelta = false
+    this._inRequestUrl = inRequest.url
   }
 
   /**

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/serializer/SerializerFactory.js

@@ -425,8 +425,21 @@ class SerializerFactory {
     const uriInfo = context.getRequest().getUriInfo()
     let type = uriInfo.getFinalEdmType()
     if (type.getKind() === EdmTypeKind.DEFINITION) type = type.getUnderlyingType()
-    const segment = uriInfo.getLastSegment(type === EdmPrimitiveTypeKind.Stream ? 0 : -1)
-    const propertyOrReturnType = segment.getProperty() || (segment.getFunction() || segment.getAction()).getReturnType()
+
+    let propertyOrReturnType
+    if (uriInfo.getLastSegment()._isStreamByDollarValue) {
+      for (const [propertyName, property] of uriInfo.getLastSegment(-1).getEdmType().getOwnProperties()) {
+        if (property.getType() === EdmPrimitiveTypeKind.Stream) {
+          propertyOrReturnType = property
+          break
+        }
+      }
+      type = EdmPrimitiveTypeKind.Stream
+    } else {
+      const segment = uriInfo.getLastSegment(type === EdmPrimitiveTypeKind.Stream ? 0 : -1)
+      propertyOrReturnType = segment.getProperty() || (segment.getFunction() || segment.getAction()).getReturnType()
+    }
+
     let value = data.value
 
     if (value === null || value === undefined) {

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/validator/OperationValidator.js

@@ -44,6 +44,7 @@ const whiteList = new Map()
       .set(HttpMethods.GET, true)
       .set(HttpMethods.PUT, true)
       .set(HttpMethods.PATCH, true)
+      .set(HttpMethods.DELETE, true)
   )
   .set(
     ResourceKinds.NAVIGATION_TO_ONE,

package/libx/_runtime/cds-services/adapter/odata-v4/to.js

@@ -3,7 +3,7 @@ const Dispatcher = require('./Dispatcher')
 const cds = require('../../../cds')
 
 const to = service => {
-  const edm = cds.compile.to.edm(service.model, { service: service.options.service })
+  const edm = cds.compile.to.edm(service.model, { service: service.definition.name })
   const odata = new OData(edm, service.model, service.options)
 
   odata.addCDSServiceToChannel(service)

package/libx/_runtime/cds-services/adapter/odata-v4/utils/data.js

@@ -97,7 +97,11 @@ function _entityOrTypeName(navSourceSegment) {
   }
 
   // TODO do it similar for both cases below?
-  return (navSourceSegment.getEntitySet() ? navSourceSegment.getEntitySet() : navSourceSegment.getNavigationProperty())
+  return (
+    navSourceSegment.getEntitySet()
+      ? navSourceSegment.getEntitySet()
+      : navSourceSegment.getNavigationProperty() || navSourceSegment.getSingleton()
+  )
     .getEntityType()
     .getFullQualifiedName()
 }
@@ -207,6 +211,9 @@ const getData = (component, odataReq, service) => {
   }
 
   if (component === DATA_DELETE_HANDLER || component === DATA_READ_HANDLER) {
+    if (component === DATA_DELETE_HANDLER && lastSegment.getKind() === 'PRIMITIVE.PROPERTY') {
+      return Object.assign(keyValues, { [lastSegment.getProperty().getName()]: null })
+    }
     return keyValues
   }
 

package/libx/_runtime/cds-services/adapter/odata-v4/utils/handlerUtils.js

@@ -3,7 +3,7 @@ const { SELECT } = cds.ql
 const { isCustomOperation } = require('./request')
 const expandToCQN = require('../odata-to-cqn/expandToCQN')
 const QueryOptions = require('../okra/odata-server').QueryOptions
-const { COMPLEX_PROPERTY } = require('../okra/odata-server').uri.UriResource.ResourceKind
+const { COMPLEX_PROPERTY, PRIMITIVE_PROPERTY } = require('../okra/odata-server').uri.UriResource.ResourceKind
 
 const _selectForFunction = (selectColumns, result, opReturnType) => {
   if (!Array.isArray(result)) result = [result]
@@ -104,6 +104,11 @@ const resolveStructuredName = (pathSegments, index, nameArr = []) => {
     const prop = pathSegments[index].getProperty()
     nameArr.unshift(prop.getName())
     return resolveStructuredName(pathSegments, --index, nameArr)
+  } else if (
+    pathSegments[index].getKind() === PRIMITIVE_PROPERTY &&
+    pathSegments[index - 1].getKind() === COMPLEX_PROPERTY
+  ) {
+    return resolveStructuredName(pathSegments, --index, nameArr)
   }
 
   return nameArr

package/libx/_runtime/cds-services/adapter/odata-v4/utils/omitValues.js

@@ -10,7 +10,7 @@ const hasOmitValuesPreference = (preferHeader, preference) => {
  * omitted from the response payload.
  *
  * @param {import('../okra/odata-server/core/OdataResponse')} response
- * @param {Map | null} omitValuesPreference
+ * @param {Map<string, boolean> | null} omitValuesPreference
  */
 const applyOmitValuesPreference = (response, omitValuesPreference) => {
   if (!omitValuesPreference || omitValuesPreference.size === 0 || !response) return
@@ -40,20 +40,27 @@ const applyOmitValuesPreference = (response, omitValuesPreference) => {
  *
  * **REVISIT**: The handling of delta payloads and instance annotations is not currently
  * implemented, as the runtime does not yet support those features.
- * In the future, you might want to use the `pathSegments` argument for the implementation
- * of delta payloads.
+ * In the future, you might want to use the `processArgs.pathSegments` argument for the
+ * implementation of delta payloads.
+ *
+ * @param {import('../../../../types/api').templateProcessorProcessFnArgs} processArgs
+ * @param {import('../../../../cds-services/adapter/odata-v4/ODataRequest')} request
+ * @param {Map<string, boolean> | null} omitValuesPreference
+ * @param {object | undefined} previousRow
  */
-const omitValue = (request, omitValuesPreference, previousRow, row, key, element, plain, isRowRoot, pathSegments) => {
+const omitValue = (processArgs, request, omitValuesPreference, previousRow) => {
   const preferHeader = request.headers.prefer
   if (!preferHeader || !omitValuesPreference) return
 
+  const { row, key, element, isRoot } = processArgs
   const defaultValue = element.default && element.default.val ? element.default.val : null
   const responseValue = row[key]
   const isDefaultValue = responseValue === defaultValue
 
   if (isDefaultValue) {
     // Don't omit the response value if the request is an update operation and it has changed it
-    if (request.event === 'UPDATE') {
+    // REVISIT: We don't have access to deep previous rows, therefore we always ignore default values in deep operations
+    if (request.event === 'UPDATE' && isRoot) {
       if (previousRow === undefined) return
       if (responseValue !== previousRow[key]) return
     }

package/libx/_runtime/cds-services/adapter/odata-v4/utils/readAfterWrite.js

@@ -3,35 +3,29 @@ const { SELECT } = cds.ql
 
 const { getDeepSelect } = require('../../../services/utils/handlerUtils')
 const { DRAFT_COLUMNS } = require('../../../../common/constants/draft')
-const { getVirtuals, getVirtualFromTarget, postProcessVirtuals } = require('../../../../db/generic/virtual')
 const { filterKeys } = require('../../../../fiori/utils/handler')
 
 const _getColumns = target => {
   const columns = []
   for (const k in target.elements) {
-    if (!target.elements[k].isAssociation && !target.elements[k].virtual && !DRAFT_COLUMNS.includes(k)) columns.push(k)
+    if (!target.elements[k].isAssociation && !DRAFT_COLUMNS.includes(k)) columns.push(k)
   }
   return columns
 }
 
 module.exports = async (req, srv) => {
   let deepSelect
-  let virtuals = []
   if (req.event === 'draftActivate') {
     const where = filterKeys(req.target.keys).reduce((w, k) => {
       w[k] = req.data[k]
       return w
     }, {})
     deepSelect = SELECT.from(req.target).columns(_getColumns(req.target)).where(where)
-    virtuals = getVirtualFromTarget(req)
   } else if (req.event === 'UPDATE') {
     deepSelect = SELECT.from(req.query.UPDATE.entity, _getColumns(req.target))
-    virtuals = getVirtualFromTarget(req)
   } else {
     deepSelect = getDeepSelect(req)
-    virtuals = getVirtuals({ query: deepSelect, target: req.target }, srv.model)
   }
   const result = await cds.tx(req).run(deepSelect)
-  postProcessVirtuals(virtuals, result)
   return result
 }

package/libx/_runtime/cds-services/adapter/odata-v4/utils/request.js

@@ -33,15 +33,15 @@ const isCustomOperation = (pathSegments, includingBound = true) => {
  * Validate resource path length and autoexposed entities.
  * It will throw an error in case the maximum is exceeded or top entity is autoexposed.
  *
- * @param {object} req odata request
- * @param {object} options odata configuration options
- * @param model
+ * @param {object} odataReq
+ * @param {object} service
  */
-const validateResourcePath = (req, options, model) => {
-  const segment = req.getUriInfo().getPathSegments()[0]
+const validateResourcePath = (odataReq, service) => {
+  const segment = odataReq.getUriInfo().getPathSegments()[0]
   if (segment.getKind() === ENTITY || segment.getKind() === ENTITY_COLLECTION) {
     const name = segment.getEntitySet().getName()
-    const entity = model.definitions[`${options.service}.${name}`]
+    // REVISIT: This validation is violating all principles of locality
+    const entity = service.model.definitions[`${service.definition.name}.${name}`]
     if (!entity) return
 
     /*
@@ -51,7 +51,7 @@ const validateResourcePath = (req, options, model) => {
      */
     if (entity._isDraftEnabled) return
     if (entity['@cds.autoexposed']) {
-      if (entity['@cds.autoexpose'] && req.getIncomingRequest().method === 'GET') {
+      if (entity['@cds.autoexpose'] && odataReq.getIncomingRequest().method === 'GET') {
         // combination GET && @cds.autoexposed && @cds.autoexpose is OK
         return
       }

package/libx/_runtime/cds-services/adapter/odata-v4/utils/result.js

@@ -71,14 +71,6 @@ const toODataResult = (result, arg) => {
   return odataResult
 }
 
-const getVirtualsFromResult = ({ elements }, result) => {
-  const virtuals = {}
-  for (const k in elements) {
-    if (elements[k].virtual) virtuals[k] = result[k]
-  }
-  return virtuals
-}
-
 const addEtags = (row, key) => {
   row['*@odata.etag'] = row[key]
 }
@@ -121,8 +113,14 @@ const addAssociationToRow = (row, foreignKey, foreignKeyElement) => {
   delete row[foreignKey]
 }
 
-const _processCategory = (category, row, key, element, options) => {
+const _processCategory = (category, processArgs, req, options, previousResult) => {
+  const { row, key, element } = processArgs
+
   switch (category) {
+    case '@odata.omitValues':
+      omitValue(processArgs, req, options.omitValuesPreference, previousResult)
+      break
+
     case '@odata.etag':
       addEtags(row, key)
       break
@@ -143,16 +141,13 @@ const _processCategory = (category, row, key, element, options) => {
   }
 }
 
-const _processorFn = (req, previousResult, options) => (row, key, element, plain, isRowRoot, pathSegments) => {
+const _processorFn = (req, previousResult, options) => processArgs => {
+  const { row, key, plain } = processArgs
   if (typeof row !== 'object' || !Object.prototype.hasOwnProperty.call(row, key)) return
-
-  omitValue(req, options.omitValuesPreference, previousResult, row, key, element, plain, isRowRoot, pathSegments)
-
   const categories = plain.categories
-  if (!categories) return
 
   for (const category of categories) {
-    _processCategory(category, row, key, element, options)
+    _processCategory(category, processArgs, req, options, previousResult)
   }
 }
 
@@ -207,9 +202,8 @@ const _pick = options => (element, target, parent) => {
   if (element['@odata.etag']) categories.push('@odata.etag')
   if (element.type === 'cds.Decimal') categories.push('@cds.Decimal')
   categories.push(..._assocs(element, target, parent))
-
+  if (options.omitValuesPreference) categories.push('@odata.omitValues')
   if (categories.length) return { categories }
-  if (options.omitValuesPreference) return true
 }
 
 const _getPostProcessOptions = headers => {
@@ -223,11 +217,13 @@ const _getPostProcessOptions = headers => {
   // REVISIT: options ie headers are not used in _pick since its cached
   // consequently, all decimals are always picked even w/o these headers
   const acceptHeader = headers.accept
+
   if (acceptHeader && acceptHeader.includes('IEEE754Compatible=true')) {
     options.decimals = { exponential: acceptHeader.includes('ExponentialDecimals=true') }
   }
 
   const preferHeader = headers.prefer
+
   if (preferHeader && preferHeader.includes('omit-values=')) {
     options.omitValuesPreference = new Map()
   }
@@ -252,6 +248,7 @@ const postProcess = (req, res, service, result, previousResult) => {
 
   // process each row
   const processFn = _processorFn(req, previousResult, options)
+
   for (const row of rows) {
     const args = {
       processFn,
@@ -270,6 +267,5 @@ const postProcess = (req, res, service, result, previousResult) => {
 
 module.exports = {
   toODataResult,
-  getVirtualsFromResult,
   postProcess
 }

package/libx/_runtime/cds-services/adapter/odata-v4/utils/stream.js

@@ -18,7 +18,9 @@ const _getProperties = async (properties, req) => {
   const cqn = cqn2cqn4sql(SELECT.one(req.query.SELECT.from), req._model).columns(properties)
 
   // REVISIT: renaming of media type property (e.g., mimeType as MimeType in AFC) not reflected in @Core.MediaType
-  if (req.target.query && !req.target.drafts) cqn.SELECT.from.ref[0] = req.target.query._target.name
+  if (req.target.query && req.target.query._target && !req.target.drafts) {
+    cqn.SELECT.from.ref[0] = req.target.query._target.name
+  }
 
   adaptStreamCQN(cqn)
 
@@ -45,26 +47,24 @@ const getStreamProperties = async (segments, srv, req) => {
   // REVISIT: we need to read direcly from db, which might not be there!
   if (!cds.db) return {}
 
-  const propertyName = segments[segments.length - 1].getProperty().getName()
-
   let contentType, entityName, namespace, contentDisposition
-  if (segments[segments.length - 2].getKind() === 'ENTITY') {
-    entityName = segments[segments.length - 2].getEntitySet().getName()
-    namespace = segments[segments.length - 2].getEdmType().getFullQualifiedName().namespace
-  } else if (segments[segments.length - 2].getKind() === 'NAVIGATION.TO.ONE') {
-    entityName = segments[segments.length - 2].getTarget().getName()
-    namespace = segments[segments.length - 2].getTarget().getEntityType().getFullQualifiedName().namespace
+  const previous = segments[segments.length - 2]
+  if (previous.getKind() === 'ENTITY') {
+    entityName = previous.getEntitySet().getName()
+    namespace = previous.getEdmType().getFullQualifiedName().namespace
+  } else if (previous.getKind() === 'NAVIGATION.TO.ONE') {
+    entityName = previous.getTarget().getName()
+    namespace = previous.getTarget().getEntityType().getFullQualifiedName().namespace
   }
 
   if (entityName) {
     const entityDefinition = findCsnTargetFor(entityName, srv.model, namespace)
     if (entityDefinition._hasPersistenceSkip) return {}
 
-    contentType = entityDefinition.elements[`${propertyName}`]['@Core.MediaType']
+    const mediaProperty = Object.values(entityDefinition.elements).find(ele => ele['@Core.MediaType'])
+    contentType = mediaProperty['@Core.MediaType']
     // @Core.ContentDisposition.Filename is correct, but we released with @Core.ContentDisposition, so we should stay compatible
-    contentDisposition =
-      entityDefinition.elements[`${propertyName}`]['@Core.ContentDisposition.Filename'] ||
-      entityDefinition.elements[`${propertyName}`]['@Core.ContentDisposition']
+    contentDisposition = mediaProperty['@Core.ContentDisposition.Filename'] || mediaProperty['@Core.ContentDisposition']
     // contentDisposition can be only dynamic
     if (typeof contentType === 'object' || contentDisposition) {
       const properties = _getDynamicProperties(contentType, contentDisposition)

package/libx/_runtime/cds-services/adapter/rest/handlers/create.js

@@ -54,7 +54,6 @@ module.exports = service => {
     try {
       const reqs = data.map(d => new RestRequest(parsed, d, restReq, restRes, service))
       result = await Promise.all(reqs.map(req => tx.dispatch(req)))
-      result = result.map(res => res[0])
 
       _transformToComplex(result, data)
       bufferToBase64(result, target)

package/libx/_runtime/cds-services/adapter/rest/handlers/operation.js

@@ -5,6 +5,7 @@ const RestRequest = require('../RestRequest')
 const getData = require('../utils/data')
 const { validateReturnType } = require('../utils/validation-checks')
 const { bufferToBase64 } = require('../utils/binary')
+const { toRestResult } = require('../utils/result')
 
 const _convertCustomOperationReturnValue = (returns, result) => {
   if (returns.items) {
@@ -56,7 +57,7 @@ module.exports = service => {
       else {
         // only set status if not yet modified
         if (restRes.statusCode === 200 && status) restRes.status(status)
-        restRes.send(body)
+        restRes.send(toRestResult(body))
       }
     }
   }

package/libx/_runtime/cds-services/adapter/rest/handlers/read.js

@@ -22,10 +22,10 @@ module.exports = service => {
     const tx = service.tx({ user: restReq.user, req: restReq, _model: service.model })
     cds.context = tx
 
-    const req = new RestRequest(parsed, data, restReq, restRes, service)
-
     let result, err, commit
     try {
+      const req = new RestRequest(parsed, data, restReq, restRes, service)
+
       result = await tx.dispatch(req)
 
       if (result == null) {

package/libx/_runtime/cds-services/adapter/rest/rest-to-cqn/index.js

@@ -2,8 +2,7 @@ const cds = require('../../../../cds')
 
 const { _newReadToCQN } = require('../../../../odata/readToCqn')
 
-// REVISIT: should be cds.ql
-const { INSERT, SELECT, UPDATE, DELETE } = require('../../../statements')
+const { INSERT, SELECT, UPDATE, DELETE } = cds.ql
 
 const { createCqlString } = require('./utils')
 const { getColumns } = require('../../../services/utils/columns')
@@ -38,7 +37,6 @@ const _readToCQN = ({ isCollection, segments }, target, restReq) => {
  */
 module.exports = (parsed, data, restReq, service) => {
   const odata2cqn = cds.env.features.rest_new_parser
-  if (odata2cqn && !cds.odata) cds.odata = require('../../../../odata')
 
   const { event, segments, target } = parsed
 
@@ -47,7 +45,7 @@ module.exports = (parsed, data, restReq, service) => {
 
   switch (event) {
     case 'CREATE':
-      return Array.isArray(data) ? data.map(d => INSERT.into(target).entries(d)) : [INSERT.into(target).entries(data)]
+      return INSERT.into(target).entries(data)
     case 'READ':
       return odata2cqn ? _newReadToCQN(service, target, restReq) : _readToCQN(parsed, target, restReq)
     case 'UPDATE':

package/libx/_runtime/cds-services/adapter/rest/utils/result.js

@@ -1,8 +1,8 @@
 /**
- * Convert any result to the result object structure, which is expected of rest.
+ * Convert any result to the format expected of rest.
  *
  * @param {*} result
- * @returns {string | object}
+ * @returns {string | object | boolean}
  */
 const toRestResult = result => {
   let restResult = result
@@ -13,6 +13,8 @@ const toRestResult = result => {
       count: result.$count,
       value: result
     }
+  } else if (typeof result === 'number') {
+    restResult = result.toString()
   }
 
   return restResult