@sap/cds 5.8.1 → 5.8.4

package/CHANGELOG.md

@@ -4,6 +4,52 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 5.8.4 - 2022-03-17
+
+### Fixed
+
+- `UPDATE` singleton entity does not require to provide singleton keys in a payload
+- CQN queries with operator expressions (`xpr`) in ON-conditions of unmanaged associations and compositions
+
+## Version 5.8.3 - 2022-03-01
+
+### Fixed
+
+- `queries` property for application defined destinations of remote services
+- `cds serve --watch` no longer fails if `@sap/cds-dk` is installed only globally
+- `cds serve` during development longer redirects URLs with similar path segments from different services, like `/service/one` and `/service`
+- `cds deploy --to sqlite` now ignores a `_texts.csv` file again if there is a language-specific file like `_texts_en.csv` present
+- Using logical blocks (surrounded with `(` and `)`) in ON-conditions of unmanaged associations and compositions
+- Skip "with parameters" clause if no order by clause or all columns in the order by clause are not strings when using parametrized views on hana
+- Limited support for binary data in OData
+  + Using of `base64` string values in `WHERE IN` on hana
+  + `base64url` values in `@odata.context` annotation
+- `cds.context` is set in GraphQL adapter
+- Using payloads with `@odata.type` annotating primitive properties no longer crashes the application. `#` in type value may be ommitted. Example:
+  ```json
+  {
+    "ID": 201,
+    "title@odata.type": "#String",
+    "title": "Wuthering Heights",
+    "stock@odata.type": "Int32",
+    "stock": 12
+  }
+  ```
+- Unicode support for i18n bundles
+
+## Version 5.8.2 - 2022-02-22
+
+### Fixed
+
+- Crash if error does not have a stack in kibana logging
+- Allow short names for bound operations in odata-server
+- Performance issue during deep operations
+- Resolving views with parameters
+- Expanding association-to-many within draft union scenario
+- Erroneous invalidation of deep `INSERT|UPDATE|DELETE` operations if root entity has managed to-one association to non-writable view
+- Handling of falsy results when sending requests to remote services
+- Resolving foreign key propagations for views with union
+
 ## Version 5.8.1 - 2022-02-11
 
 ### Fixed
@@ -23,7 +69,7 @@
 
 ### Added
 
-- Custom `server.js` don't have to export `cds.server` anymore -> we use that by default now. 
+- Custom `server.js` don't have to export `cds.server` anymore -> we use that by default now.
 - In `cds.requires`: Support to replace primitive values with objects
 - Support filter functions on renamed properties from external service
 - Results of database queries use `big.js` for values of type `cds.Decimal` and `cds.Integer64` if enabled via `cds.env.features.bigjs`
@@ -36,9 +82,6 @@
 - Restrict access to all services via `cds.env.requires.auth.restrict_all_services = true`
   + That is, all unrestricted services (i.e., w/o own `@requires`) are treated as having `@requires: 'authenticated-user'`
 - Threshold for automatically sending GET requests as `$batch` (beta, cf. @sap/cds@5.6.0) can be configured per remote service via `cds.env.requires.<srv>.max_get_url_length` (if not configured on service, the global config applies)
-- Alpha out-of-the-box support for DwC
-  + Authentication based on headers set by Jupiter router via `cds.env.requires.auth.kind = 'dwc-auth'`
-  + All DwC headers are forwarded to remote service via `cds.env.requires.<srv>.forward_dwc_headers = true`
 - Limited support for binary data in OData
   + In payloads, the binary data must be a base64 encoded string
   + In URLs, the binary data must have the following format: `binary'<url-safe base64 encoded>'`, e.g., `$filter=ID eq binary'Q0FQIE5vZGUuanM='`
@@ -91,6 +134,12 @@
   + Request data properties of types `cds.Date`, `cds.DateTime` and `cds.Timestamp` are converted accordingly to OData V2 specification
   + Response data properties of types `cds.Decimal`, `cds.DecimalFloat` (deprecated) and `cds.Integer64` are handled properly when using `Accept` header with `IEEE754Compatible=true/false` and `ExponentialDecimals=true/false` format parameters
 
+## Version 5.7.6 - 2022-02-23
+
+### Fixed
+
+- `draftActivate` action does not return children if not requested
+
 ## Version 5.7.5 - 2022-01-14
 
 ### Fixed

package/app/fiori/routes.js

@@ -15,6 +15,9 @@ cds.on ('bootstrap', app => {
     app.use('*/'+uri, ({originalUrl}, res, next)=> {  //  */browse/webapp[/prefix]/browse/
       // any of our special URLs ($fiori-, $api-docs) ? -> next
       if (originalUrl.startsWith('/$'))  return next()
+      // is there a service starting with the URL? -> next
+      if (cds.service.providers.find (srv => originalUrl.startsWith(srv.path)))  return next()
+
       // is there a service for '[prefix]/browse' ?
       const srv = serviceForUri[uri] || (serviceForUri[uri] =
         cds.service.providers.find (srv => ('/'+uri).lastIndexOf(srv.path) >=0))

package/bin/cds.js

@@ -15,13 +15,17 @@ const cli = { //NOSONAR
     if (!argv.length) argv = process.argv.slice(3)
     if (cmd in this.Shortcuts) cmd = process.argv[2] = this.Shortcuts[cmd]
     if (process.env.NODE_ENV !== 'test')  this.errorHandlers()
-    const task = _require ('./'+cmd)
-      || _require ('@sap/cds-dk/bin/'+cmd) // if dk is in installed modules
-      || _require (_npmGlobalModules()+'/@sap/cds-dk/bin/'+cmd)  // needed for running cds in npm scripts
+    const task = this.load(cmd)
     if (!task)  return _requires_cdsdk (cmd)
     return task.apply (this, this.args(task,argv))
   },
 
+  load (cmd) {
+    return _require ('./'+cmd)
+      || _require ('@sap/cds-dk/bin/'+cmd) // if dk is in installed modules
+      || _require (_npmGlobalModules()+'/@sap/cds-dk/bin/'+cmd)  // needed for running cds in npm scripts
+  },
+
   args (task, argv) {
 
     const { options:o=[], flags:f=[], shortcuts:s=[] } = task

package/bin/serve.js

@@ -143,7 +143,7 @@ async function serve (all=[], o={}) { // NOSONAR
 
   // IMPORTANT: never load any @sap/cds modules before the chdir above happened!
   // handle --watch and --project
-  if (o.watch)  return _watch (o.project,o)   // cds serve --watch <project>
+  if (o.watch)  return _watch.call(this, o.project,o)   // cds serve --watch <project>
   if (o.project) _chdir_to (o.project)      // cds run --project <project>
   if (!o.silent) _prepare_logging ()
 
@@ -240,7 +240,7 @@ function _prepare_logging () { // NOSONAR
 /** handles --watch option */
 function _watch (project,o) {
   o.args = process.argv.slice(2) .filter (a => a !== '--watch' && a !== '-w')
-  return require('@sap/cds-dk/bin/watch')([project],o)
+  return this.load('watch')([project],o)
 }
 
 

package/lib/deploy.js

@@ -152,7 +152,7 @@ function init_from_json (db, csn, SILENT) {
  */
 function prefer_translated_texts (file, all) {
   if (/[._]texts\.(json|csv)$/.test (file)) {
-    const pattern = new RegExp('^'+ path.basename(file) +'_')
+    const pattern = new RegExp('^'+ path.parse(file).name +'_')
     const translated = all.filter (f => pattern.test(f))
     if (translated.length > 0) {
       DEBUG && DEBUG (`ignoring '${file}' in favor of [${translated}]`)  // eslint-disable-line

package/lib/log/format/kibana.js

@@ -1,4 +1,4 @@
-const cds = require ('../../')
+const cds = require('../../')
 const util = require('util')
 
 const _l2l = { 1: 'error', 2: 'warn', 3: 'info', 4: 'debug', 5: 'trace' }
@@ -8,7 +8,7 @@ const _l2l = { 1: 'error', 2: 'warn', 3: 'info', 4: 'debug', 5: 'trace' }
  */
 module.exports = (module, level, ...args) => {
   // config
-  const { user: log_user , kibana_custom_fields } = cds.env.log
+  const { user: log_user, kibana_custom_fields } = cds.env.log
 
   // build the object to log
   const toLog = {
@@ -36,7 +36,7 @@ module.exports = (module, level, ...args) => {
   if (args.length && typeof args[0] === 'object' && args[0].message) {
     const err = args.shift()
     toLog.msg = err.message
-    if (err instanceof Error) toLog.stacktrace = err.stack.split(/\s*\r?\n\s*/)
+    if (typeof err.stack === 'string') toLog.stacktrace = err.stack.split(/\s*\r?\n\s*/)
     Object.assign(toLog, err, { level: toLog.level })
   }
 

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

@@ -45,9 +45,7 @@ function _getTarget(service, segments) {
       : last.getEdmType().csdlStructuredType.name
 
     // autoexposed entities now used . in csn and _ in edm
-    const target =
-      findCsnTargetFor(name, service.model, namespace) ||
-      (name.endsWith('Parameters') && service.model.definitions[namespace + '.' + name.replace(/Parameters$/, '')])
+    const target = findCsnTargetFor(name, service.model, namespace)
 
     if (target && target.kind === 'entity') {
       return target

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

@@ -14,6 +14,12 @@ const { setStatusCodeAndHeader, getKeyProperty } = require('../../../../fiori/ut
 const { toODataResult, postProcess } = require('../utils/result')
 const { mergeJson } = require('../../../services/utils/compareJson')
 
+const _isAssocOrCompNotLocalized = (reqTarget, el) => {
+  return (
+    reqTarget.elements[el].isAssociation && (!reqTarget.texts || reqTarget.elements[el].target !== reqTarget.texts.name)
+  )
+}
+
 const _postProcessDraftActivate = async (req, result, service) => {
   // update req.data (keys needed in readAfterWrite)
   req.data = result
@@ -25,6 +31,13 @@ const _postProcessDraftActivate = async (req, result, service) => {
   result.HasActiveEntity = false
   result.HasDraftEntity = false
 
+  // remove children from result, excluding localized composition 'text'
+  if (!cds.env.effective.odata.structs) {
+    for (const k in req.target.elements) {
+      if (_isAssocOrCompNotLocalized(req.target, k)) delete result[k]
+    }
+  }
+
   return result
 }
 

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/ResourcePathParser.js

@@ -396,7 +396,18 @@ class ResourcePathParser {
       throw new UriSyntaxError(UriSyntaxError.Message.PREVIOUS_TYPE_HAS_NO_MEDIA, currentType.getName())
     }
 
-    const uriResources = this._parsePropertyPath(uriPathSegments, currentResource, tokenizer)
+    let uriResources
+    try {
+      uriResources = this._parsePropertyPath(uriPathSegments, currentResource, tokenizer)
+    } catch (e) {
+      try {
+        uriResources = this._parseBoundOperation(uriPathSegments, currentResource, tokenizer)
+      } catch (e1) {
+        // throw first error
+        throw e
+      }
+    }
+
     return result.concat(uriResources)
   }
 
@@ -409,7 +420,17 @@ class ResourcePathParser {
    * @private
    */
   _parseBoundOperation (uriPathSegments, currentResource, tokenizer) {
-    const fqn = FullQualifiedName.createFromNameSpaceAndName(tokenizer.getText())
+    // allow short names for bound operations
+    let name = tokenizer.getText()
+    if (typeof name === 'string' && !name.match(/\./)) {
+      const namespace = currentResource._entitySet &&
+        currentResource._entitySet._target &&
+        currentResource._entitySet._target.type &&
+        currentResource._entitySet._target.type.namespace
+      if (namespace) name = namespace + '.' + name
+    }
+
+    const fqn = FullQualifiedName.createFromNameSpaceAndName(name)
     const bindingParamTypeFqn = currentResource.getEdmType().getFullQualifiedName()
 
     // parse bound action

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-commons/uri/UriHelper.js

@@ -50,7 +50,7 @@ class UriHelper {
     if (value === null) return 'null'
     if (edmType === EdmPrimitiveTypeKind.String) return "'" + value.replace(REGEXP_SINGLE_QUOTE, "''") + "'"
     if (edmType === EdmPrimitiveTypeKind.Duration) return "duration'" + value + "'"
-    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + value + "'"
+    if (edmType === EdmPrimitiveTypeKind.Binary) return "binary'" + value.replace(/\//g, '_').replace(/\+/g, '-') + "'"
     if (edmType.getKind() === EdmTypeKind.DEFINITION) {
       return UriHelper.toUriLiteral(value, edmType.getUnderlyingType())
     }

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/deserializer/ResourceJsonDeserializer.js

@@ -347,12 +347,9 @@ class ResourceJsonDeserializer {
       }
       const expectedTypeName =
         expectedType.getKind() === EdmTypeKind.PRIMITIVE ? expectedType.getName() : expectedType.getFullQualifiedName()
-      const typeName =
-        typeof value === 'string' &&
-        value.startsWith(isCollection ? '#Collection(' : '#') &&
-        value.endsWith(isCollection ? ')' : '')
-          ? value.substring(isCollection ? 12 : 1, value.length - (isCollection ? 1 : 0))
-          : null
+      const typeNameRegex = isCollection ? /^#?Collection\((.*)\)$/ : /^#?(.*)$/
+      const matchedTypeName = typeof value === 'string' && value.match(typeNameRegex)
+      const typeName = matchedTypeName && matchedTypeName[1]
       // The type name could be an alias-qualified name; for that case we have to do an EDM look-up.
       const fullQualifiedName =
         typeName && typeName.indexOf('.') > 0 && typeName.lastIndexOf('.') < typeName.length - 1
@@ -369,6 +366,8 @@ class ResourceJsonDeserializer {
         throw new DeserializationError(
           "The value of '" + name + "' must describe correctly the type '" + expectedType.getFullQualifiedName() + "'."
         )
+      } else {
+        delete structureValue[name]
       }
     } else if (name.endsWith(JsonAnnotations.BIND) && !isDelta) {
       const navigationPropertyName = name.substring(0, name.length - JsonAnnotations.BIND.length)

package/libx/_runtime/cds-services/adapter/odata-v4/okra/odata-server/utils/UriHelper.js

@@ -6,6 +6,7 @@ const AbstractError = commons.errors.AbstractError
 const UriSyntaxError = commons.errors.UriSyntaxError
 const IllegalArgumentError = commons.errors.IllegalArgumentError
 const NotImplementedError = commons.errors.NotImplementedError
+const EdmPrimitiveTypeKind = require('../../odata-commons/edm/EdmPrimitiveTypeKind')
 
 /**
  * UriHelper has utility methods for reading and constructing URIs.
@@ -103,7 +104,9 @@ class UriHelper {
     for (const key of keys) {
       url = url ? url + ',' : ''
       if (keys.length > 1) url += encodeURIComponent(key.name) + '='
-      url += encodeURIComponent(CommonsUriHelper.toUriLiteral(key.value, key.type))
+      url += key.type === EdmPrimitiveTypeKind.Binary
+        ? CommonsUriHelper.toUriLiteral(key.value, key.type)
+        : encodeURIComponent(CommonsUriHelper.toUriLiteral(key.value, key.type))
     }
     return '(' + url + ')'
   }

package/libx/_runtime/common/composition/tree.js

@@ -38,7 +38,7 @@ const _foreignKeysToLinks = (element, inverse) =>
 const _resolvedElement = (element, service) => {
   if (!element.target) return element
   // skip forbidden view check if association to view with foreign key in target
-  const skipForbiddenViewCheck = element._isAssociationStrict && element.on && !element['@odata.contained']
+  const skipForbiddenViewCheck = element._isAssociationStrict && !element['@odata.contained']
   const { target, mapping } = getTransition(element._target, service, skipForbiddenViewCheck)
   const newElement = { target: target.name, _target: target }
   Object.setPrototypeOf(newElement, element)

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

@@ -7,6 +7,7 @@ const replaceManagedData = require('../utils/dollar')
 const { deepCopyArray } = require('../utils/copy')
 
 const onlyKeysRemain = require('../utils/onlyKeysRemain')
+const { getColumns } = require('../../cds-services/services/utils/columns')
 
 const _targetEntityDoesNotExist = async req => {
   const { query } = req
@@ -98,10 +99,11 @@ module.exports = cds.service.impl(function () {
       result = req.data
     }
 
-    if (req.event === 'DELETE' && req.target._isSingleton) {
-      if (!req.target['@odata.singleton.nullable']) req.reject(400, 'SINGLETON_NOT_NULLABLE')
-
-      const singleton = await cds.tx(req).run(SELECT.one(req.target))
+    if (req.event in { DELETE: 1, UPDATE: 1 } && req.target && req.target._isSingleton) {
+      if (req.event === 'DELETE' && !req.target['@odata.singleton.nullable']) req.reject(400, 'SINGLETON_NOT_NULLABLE')
+      const keyColumns = getColumns(req.target, { onlyNames: true, keysOnly: true })
+      const selectSingleton = SELECT.one(req.target).columns(keyColumns)
+      const singleton = await cds.tx(req).run(selectSingleton)
       if (!singleton) req.reject(404)
       req.query.where(singleton)
     }

package/libx/_runtime/common/i18n/index.js

@@ -2,7 +2,6 @@ const fs = require('fs')
 const path = require('path')
 
 const cds = require('../../cds')
-const LOG = cds.log('app')
 
 const dirs = (cds.env.i18n && cds.env.i18n.folders) || []
 
@@ -50,36 +49,8 @@ function init(locale, file) {
   if (!file) file = findFile(locale)
   if (!file) return
 
-  let raw
-  try {
-    raw = fs.readFileSync(file, 'utf-8')
-  } catch (e) {
-    if (LOG._warn) {
-      e.message = `Unable to load file "${file}" for locale "${locale}" due to error: ` + e.message
-      LOG.warn(e)
-    }
-    return
-  }
-
-  try {
-    const pairs = raw
-      .replace(/\r/g, '')
-      .split(/\n/)
-      .map(ele => ele.trim())
-      .filter(ele => ele && !ele.startsWith('#'))
-      .map(ele => {
-        const del = ele.indexOf('=')
-        return [ele.slice(0, del), ele.slice(del + 1)].map(ele => ele.trim())
-      })
-    for (const [key, value] of pairs) {
-      i18ns[locale][key] = value
-    }
-  } catch (e) {
-    if (LOG._warn) {
-      e.message = `Unable to process file "${file}" for locale "${locale}" due to error: ` + e.message
-      LOG.warn(e)
-    }
-  }
+  const props = cds.load.properties(file)
+  i18ns[locale] = props
 }
 
 init('default', path.join(__dirname, 'messages.properties'))

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

@@ -79,8 +79,20 @@ const getDataSubject = (entity, model, role) => {
   return entity.set(hash, dataSubject)
 }
 
-const _resolve = (name, model, namespace) =>
-  model.entities(namespace)[name] || model.definitions[`${namespace}.${name}`]
+const _findInModel = (name, model, namespace) => {
+  return model.entities(namespace)[name] || model.definitions[`${namespace}.${name}`]
+}
+
+const _resolve = (name, model, namespace) => {
+  const resolved = _findInModel(name, model, namespace)
+  // the edm name has an additional suffix 'Parameters' in case of views with parameters
+  if (!resolved && name.endsWith('Parameters')) {
+    const viewWithParam = _findInModel(name.replace(/Parameters$/, ''), model, namespace)
+    if (!viewWithParam || !viewWithParam.params) return
+    return viewWithParam
+  }
+  return resolved
+}
 
 const _findRootEntity = (model, edmName, namespace) => {
   const parts = edmName.split('_')

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

@@ -178,6 +178,12 @@ const _resolveTargetForeignKey = targetKey => {
   return { targetName, propagation }
 }
 
+const _resolveColumnsFromQuery = query => {
+  if (query && query.SET) return _resolveColumnsFromQuery(query.SET.args[0])
+  if (query && query.SELECT && query.SELECT.columns) return query.SELECT.columns
+  return []
+}
+
 const _resolvedKeys = (foreignKeys, targetKeys, fillChild) => {
   const foreignKeyPropagations = []
 
@@ -191,12 +197,9 @@ const _resolvedKeys = (foreignKeys, targetKeys, fillChild) => {
      * Once you have the full path, you can find it in the target entity.
      * NOTE: There can be projections upon projections and renamings in every projection. -> not yet covered!!!
      */
-    const tkCol =
-      targetKeys[i].parent.query &&
-      targetKeys[i].parent.query.SELECT.columns &&
-      targetKeys[i].parent.query.SELECT.columns.find(
-        c => c.ref && `${fk['@odata.foreignKey4']}_${c.ref.join('_')}` === fk.name
-      )
+    const tkCol = _resolveColumnsFromQuery(targetKeys[i].parent.query).find(
+      c => c.ref && `${fk['@odata.foreignKey4']}_${c.ref.join('_')}` === fk.name
+    )
     tk = tkCol && targetKeys.find(tk => tk.name === (tkCol.as ? tkCol.as : tkCol.ref.join('_')))
     // with composition of aspects, the lookup fails -> we need this final fallback
     if (!tk) tk = targetKeys[i]

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

@@ -4,9 +4,8 @@ const _toRef = (alias, column) => {
 }
 
 const _adaptRefs = (onCond, path, { select, join }) => {
-  const adaptedOnCondition = onCond.map(el => {
+  const _adaptEl = el => {
     const ref = el.ref
-
     if (ref) {
       if (ref[0] === path.join('_') && ref[1]) {
         return _toRef(select, ref.slice(1))
@@ -18,12 +17,13 @@ const _adaptRefs = (onCond, path, { select, join }) => {
       }
 
       return _toRef(join, ref.slice(0))
+    } else if (el.xpr) {
+      return { xpr: el.xpr.map(_adaptEl) }
     }
 
     return el
-  })
-
-  return adaptedOnCondition
+  }
+  return onCond.map(_adaptEl)
 }
 
 const _args = (csnElement, path, aliases) => {

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

@@ -1151,28 +1151,37 @@ class JoinCQNFromExpanded {
           }
         }
       }
-      const ks = Object.keys(expandedEntity.keys).filter(
-        c => !expandedEntity.keys[c].isAssociation && !DRAFT_COLUMNS.includes(c)
-      )
-      const user = (cds.context && cds.context.user && cds.context.user.id) || 'anonymous'
-      const unionFrom = getCQNUnionFrom(cols, ref.replace(/_drafts$/, ''), ref, ks, user)
-      for (const each of cqn.columns) {
-        if (!each.as) continue
-        // replace val with ref
-        if (each.as === 'IsActiveEntity' || each.as === 'HasActiveEntity') {
-          delete each.val
-          each.ref = [tableAlias, each.as]
-          each.as = tableAlias + '_' + each.as
-        }
-        // ensure the cast
-        if (each.as.match(/IsActiveEntity$/) || each.as.match(/HasActiveEntity$/) || each.as.match(/HasDraftEntity$/)) {
-          each.cast = { type: 'cds.Boolean' }
+
+      if (!cqn[IS_ACTIVE]) {
+        const ks = Object.keys(expandedEntity.keys).filter(
+          c => !expandedEntity.keys[c].isAssociation && !DRAFT_COLUMNS.includes(c)
+        )
+        const user = (cds.context && cds.context.user && cds.context.user.id) || 'anonymous'
+        const unionFrom = getCQNUnionFrom(cols, ref.replace(/_drafts$/, ''), ref, ks, user)
+        for (const each of cqn.columns) {
+          if (!each.as) continue
+          // replace val with ref
+          if (each.as === 'IsActiveEntity' || each.as === 'HasActiveEntity') {
+            delete each.val
+            each.ref = [tableAlias, each.as]
+            each.as = tableAlias + '_' + each.as
+          }
+          // ensure the cast
+          if (
+            each.as.match(/IsActiveEntity$/) ||
+            each.as.match(/HasActiveEntity$/) ||
+            each.as.match(/HasDraftEntity$/)
+          ) {
+            each.cast = { type: 'cds.Boolean' }
+          }
         }
+        const cs = cqn.columns
+          .filter(c => !c.expand && c.ref && c.ref[0] === tableAlias)
+          .map(c => ({ ref: [c.ref[1]] }))
+        const unionArgs = cqn.from.args
+        unionArgs[0].SELECT = { columns: cs, from: unionFrom, distinct: true }
+        delete unionArgs[0].ref
       }
-      const cs = cqn.columns.filter(c => !c.expand && c.ref && c.ref[0] === tableAlias).map(c => ({ ref: [c.ref[1]] }))
-      const unionArgs = cqn.from.args
-      unionArgs[0].SELECT = { columns: cs, from: unionFrom, distinct: true }
-      delete unionArgs[0].ref
     }
 
     return cqn

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

@@ -1,14 +1,18 @@
-function _flattenDeep(arr) {
-  return arr.reduce((acc, val) => acc.concat(Array.isArray(val) ? _flattenDeep(val) : val), [])
+const _flattenDeep = (arr, res) => {
+  if (!Array.isArray(arr)) {
+    res.push(arr)
+    return res
+  }
+  for (const a of arr) {
+    _flattenDeep(a, res)
+  }
+  return res
 }
 
 /*
  * flatten with a dfs approach. this is important!!!
  */
-function getFlatArray(arg) {
-  if (!Array.isArray(arg)) return [arg]
-  return _flattenDeep(arg)
-}
+const getFlatArray = arg => _flattenDeep(arg, [])
 
 async function _processChunk(processFn, model, dbc, cqns, user, locale, ts, indexes, results) {
   const promises = []

package/libx/_runtime/hana/customBuilder/CustomSelectBuilder.js

@@ -48,7 +48,7 @@ class CustomSelectBuilder extends SelectBuilder {
           select.from.ref &&
           select.from.ref.length === 1 &&
           // REVISIT this does not work with join and draft!
-          this._csn.definitions[select.from.ref[0]]
+          this._csn.definitions[select.from.ref[0].id || select.from.ref[0]]
         // TODO FIXME
         skip =
           !select.orderBy ||

package/libx/_runtime/hana/dynatrace.js

@@ -7,11 +7,12 @@ try {
 }
 
 const isDynatraceEnabled = () => {
-  return dynatrace.sdk !== undefined
+  return dynatrace.sdk !== undefined && !process.env.CDS_SKIP_DYNATRACE
 }
 
 const _dynatraceResultCallback = function (tracer, cb) {
-  return function (err, results, fields) {
+  return function (err, ...args) {
+    const results = args.shift()
     if (err) {
       tracer.error(err)
     } else {
@@ -19,7 +20,7 @@ const _dynatraceResultCallback = function (tracer, cb) {
         rowsReturned: (results && results.length) || results
       })
     }
-    tracer.end(cb, err, results, fields)
+    tracer.end(cb, err, results, ...args)
   }
 }
 
@@ -73,9 +74,14 @@ const dynatraceClient = (client, credentials, tenant) => {
   // hana-client does not like decorating.
   // because of that, we need to override the fn and pass the original fn for execution
   const originalExecFn = client.exec
-  const originalPrepareFn = client.prepare
   client.exec = _execUsingDynatrace(client, originalExecFn, dbInfo)
-  client.prepare = _preparedStmtUsingDynatrace(client, originalPrepareFn, dbInfo)
+  const originalPrepareFn = client.prepare
+  if (client.name === '@sap/hana-client') {
+    // client.prepare = ... doesn't work for hana-client
+    Object.defineProperty(client, 'prepare', { value: _preparedStmtUsingDynatrace(client, originalPrepareFn, dbInfo) })
+  } else {
+    client.prepare = _preparedStmtUsingDynatrace(client, originalPrepareFn, dbInfo)
+  }
 
   return client
 }

package/libx/_runtime/hana/execute.js

@@ -51,7 +51,8 @@ function _getOutputParameters(stmt) {
 const BINARY_TYPES = {
   12: 'BINARY',
   13: 'VARBINARY',
-  27: 'BLOB'
+  27: 'BLOB',
+  33: 'BSTRING'
 }
 
 function _getBinaries(stmt) {
@@ -66,15 +67,73 @@ function _getBinaries(stmt) {
 
 const BASE64 = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{4}|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}={2})$/
 
+function _isProcedureCall(sql) {
+  return sql.trim().match(/^call \s*"{0,1}\w*/i)
+}
+
+function _getProcedureName(sql) {
+  const match = sql.trim().match(/^call \s*"{0,1}(\w*)/i)
+  return match && match[1]
+}
+
+function _hdbGetResultForProcedure(rows, args, outParameters) {
+  // on hdb, rows already contains results for scalar params
+  const result = rows || {}
+  // merge table output params into scalar params
+  if (args && args.length && outParameters) {
+    const params = outParameters.filter(md => !(md.PARAMETER_NAME in rows))
+    for (let i = 0; i < args.length; i++) {
+      result[params[i].PARAMETER_NAME] = args[i]
+    }
+  }
+  return result
+}
+
+function _hcGetResultForProcedure(stmt, resultSet, outParameters) {
+  const result = {}
+  // build result from scalar params
+  const paramInfo = stmt.getParameterInfo()
+  if (paramInfo.some(p => p.direction > 1)) {
+    for (let i = 0; i < paramInfo.length; i++) {
+      if (paramInfo[i].direction > 1) {
+        result[paramInfo[i].name] = stmt.getParameterValue(i)
+      }
+    }
+  }
+  // merge table output params into scalar params
+  if (outParameters && outParameters.length) {
+    const params = outParameters.filter(md => !(md.PARAMETER_NAME in result))
+    let i = 0
+    while (resultSet.next()) {
+      result[params[i].PARAMETER_NAME] = [resultSet.getValues()]
+      resultSet.nextResult()
+      i++
+    }
+  }
+  return result
+}
+
+function _getProcedureMetadata(procedureName, dbc) {
+  return new Promise((resolve, reject) => {
+    dbc.exec(
+      `SELECT PARAMETER_NAME FROM SYS.PROCEDURE_PARAMETERS WHERE SCHEMA_NAME = CURRENT_SCHEMA AND PROCEDURE_NAME = '${procedureName}' AND PARAMETER_TYPE IN ('OUT', 'INOUT') ORDER BY POSITION`,
+      (err, res) => {
+        if (err) reject(err)
+        else resolve(res)
+      }
+    )
+  })
+}
+
 function _executeAsPreparedStatement(dbc, sql, values, reject, resolve) {
-  dbc.prepare(sql, function (err, stmt) {
+  dbc.prepare(sql, async function (err, stmt) {
     if (err) {
       err.query = sql
       if (values) err.values = SANITIZE_VALUES ? ['***'] : values
       return reject(err)
     }
 
-    // convert binary strings to buffers ()
+    // convert binary strings to buffers
     if (cds.env.hana.base64_to_buffer !== false && _hasValues(values)) {
       const binaries = _getBinaries(stmt)
       if (binaries.length) {
@@ -89,6 +148,46 @@ function _executeAsPreparedStatement(dbc, sql, values, reject, resolve) {
       }
     }
 
+    if (cds.env.features.new_call_prodecure) {
+      // procedure call metadata
+      let outParameters
+      const isProcedureCall = _isProcedureCall(sql)
+      if (isProcedureCall) {
+        try {
+          const procedureName = _getProcedureName(sql)
+          outParameters = await _getProcedureMetadata(procedureName, dbc)
+        } catch (e) {
+          LOG._warn && LOG.warn('Unable to fetch procedure metadata due to error:', e)
+        }
+      }
+
+      // on @sap/hana-client, we need to use execQuery in case of calling procedures
+      stmt[isProcedureCall && dbc.name !== 'hdb' ? 'execQuery' : 'exec'](values, function (err, rows, ...args) {
+        if (err) {
+          stmt.drop(() => {})
+          err.query = sql
+          if (values) err.values = SANITIZE_VALUES ? ['***'] : values
+          return reject(err)
+        }
+
+        let result
+        if (isProcedureCall) {
+          result =
+            dbc.name === 'hdb'
+              ? _hdbGetResultForProcedure(rows, args, outParameters)
+              : _hcGetResultForProcedure(stmt, rows, outParameters)
+        } else {
+          result = rows
+        }
+
+        stmt.drop(() => {})
+
+        resolve(result)
+      })
+
+      return
+    }
+
     stmt.exec(values, function (err, rows, procedureReturn) {
       if (err) {
         stmt.drop(() => {})
@@ -123,15 +222,15 @@ function _executeSimpleSQL(dbc, sql, values) {
       values = Object.values(values)
     }
     // ensure that stored procedure with parameters is always executed as prepared
-    if (_hasValues(values) || sql.match(/^call.*?\?.*$/i)) {
+    if (_hasValues(values) || _isProcedureCall(sql)) {
       _executeAsPreparedStatement(dbc, sql, values, reject, resolve)
     } else {
-      dbc.exec(sql, function (err, result, procedureReturn) {
+      dbc.exec(sql, function (err, result) {
         if (err) {
           err.query = sql
           return reject(err)
         }
-        resolve(procedureReturn || result)
+        resolve(result)
       })
     }
   })

package/libx/_runtime/remote/utils/client.js

@@ -67,6 +67,11 @@ const getDestination = (name, credentials) => {
     throw new Error(`"url" or "destination" property must be configured in "credentials" of "${name}".`)
   }
 
+  // Cloud SDK wants property "queryParameters" but we have documented "queries"
+  if (credentials.queries && !credentials.queryParameters) {
+    credentials.queryParameters = credentials.queries
+  }
+
   return { name, ...credentials }
 }
 
@@ -142,8 +147,8 @@ function _defineProperty(obj, property, value) {
 }
 
 function _normalizeMetadata(prefix, data, results) {
-  const target = results || data
-  if (typeof target !== 'object') return target
+  const target = results !== undefined ? results : data
+  if (typeof target !== 'object' || target === null) return target
   const metadataKeys = Object.keys(data).filter(k => prefix.test(k))
   for (const k of metadataKeys) {
     const $ = k.replace(prefix, '$')
@@ -169,7 +174,7 @@ const _purgeODataV2 = (data, target, reqHeaders) => {
   data = data.d
   const ieee754Compatible = reqHeaders.accept && reqHeaders.accept.includes('IEEE754Compatible=true')
   const exponentialDecimals = ieee754Compatible && reqHeaders.accept.includes('ExponentialDecimals=true')
-  const purgedResponse = data.results || data
+  const purgedResponse = 'results' in data ? data.results : data
   const convertedResponse = convertV2ResponseData(purgedResponse, target, ieee754Compatible, exponentialDecimals)
   return _normalizeMetadata(/^__/, data, convertedResponse)
 }
@@ -177,7 +182,7 @@ const _purgeODataV2 = (data, target, reqHeaders) => {
 const _purgeODataV4 = data => {
   if (typeof data !== 'object') return data
 
-  const purgedResponse = data.value || data
+  const purgedResponse = 'value' in data ? data.value : data
   return _normalizeMetadata(/^@odata\./, data, purgedResponse)
 }
 

package/libx/_runtime/remote/utils/data.js

@@ -39,7 +39,8 @@ const _getConvertRecordFn = (target, convertValueFn) => record => {
     if (!element) continue
 
     const recordValue = record[key]
-    const value = (recordValue && recordValue.results) || recordValue
+    const value =
+      (recordValue && typeof recordValue === 'object' && 'results' in recordValue && recordValue.results) || recordValue
 
     if (value && (element.isAssociation || Array.isArray(value))) {
       record[key] = _convertData(value, element._target, convertValueFn)

package/libx/gql/resolvers/crud/create.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToEntries } = require('../parse/ast2cqn')
 const { entriesStructureToEntityStructure } = require('./utils')
@@ -9,7 +11,10 @@ module.exports = async (service, entityFQN, selection) => {
   const entries = entriesStructureToEntityStructure(service, entityFQN, astToEntries(input))
   query.entries(entries)
 
-  const result = await service.tx(tx => tx.run(query))
+  const result = await service.tx(tx => {
+    cds.context = tx
+    return tx.run(query)
+  })
 
   return Array.isArray(result) ? result : [result]
 }

package/libx/gql/resolvers/crud/delete.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToWhere } = require('../parse/ast2cqn')
 
@@ -11,7 +13,10 @@ module.exports = async (service, entityFQN, selection) => {
 
   let result
   try {
-    result = await service.tx(tx => tx.run(query))
+    result = await service.tx(tx => {
+      cds.context = tx
+      return tx.run(query)
+    })
   } catch (e) {
     if (e.code === 404) {
       result = 0

package/libx/gql/resolvers/crud/read.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToColumns, astToWhere, astToOrderBy, astToLimit } = require('../parse/ast2cqn')
 
@@ -21,5 +23,8 @@ module.exports = async (service, entityFQN, selection) => {
     query.limit(astToLimit(top, skip))
   }
 
-  return await service.tx(tx => tx.run(query))
+  return await service.tx(tx => {
+    cds.context = tx
+    return tx.run(query)
+  })
 }

package/libx/gql/resolvers/crud/update.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToColumns, astToWhere, astToEntries } = require('../parse/ast2cqn')
 const { entriesStructureToEntityStructure } = require('./utils')
@@ -24,8 +26,9 @@ module.exports = async (service, entityFQN, selection) => {
 
   let resultBeforeUpdate
   const result = await service.tx(async tx => {
+    cds.context = tx
     // read needs to be done before the update, otherwise the where clause might become invalid (case that properties in where clause are updated by the mutation)
-    resultBeforeUpdate = await service.tx(tx => tx.run(queryBeforeUpdate))
+    resultBeforeUpdate = await tx.run(queryBeforeUpdate)
     return tx.run(query)
   })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "5.8.1",
+  "version": "5.8.4",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [