@sap/cds 5.8.0 → 5.8.3

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

@@ -99,6 +99,7 @@ const _getVal = (data, name) => {
 
 const _filterForStructProperty = (structElement, structData, op, prefix = '', nav = []) => {
   const filterArray = []
+  const andOr = op === '!=' ? 'or' : 'and'
 
   for (const elementName in structElement.elements) {
     const element = structElement.elements[elementName]
@@ -123,8 +124,8 @@ const _filterForStructProperty = (structElement, structData, op, prefix = '', na
           for (const key in assoc._target.keys) {
             if (element.name === `${assocName}_${key}`) {
               const ref = [`${prefix}_${assocName}_${key}`]
-              const val = _getVal(structData[assocName], key)
-              filterArray.push({ ref }, op, { val }, 'and')
+              const val = _getVal(structData && structData[assocName], key)
+              filterArray.push({ ref }, op, { val }, andOr)
             }
           }
         }
@@ -134,7 +135,7 @@ const _filterForStructProperty = (structElement, structData, op, prefix = '', na
         { ref: [...nav, `${prefix}_${element.name}`] },
         op,
         { val: _getVal(structData, element.name) },
-        'and'
+        andOr
       )
     }
   }
@@ -182,7 +183,12 @@ const _transformStructToFlatWhereHaving = ([first, op, second], resArray, struct
   } else {
     // transform complex structured to multiple single structured
     const { nestedElement, prefix } = _nestedStructElement(structProperties, structElement)
-    resArray.push(..._filterForStructProperty(nestedElement, structData, op, prefix, nav))
+    const filterForStructProperty = _filterForStructProperty(nestedElement, structData, op, prefix, nav)
+    if (filterForStructProperty.length) {
+      filterForStructProperty.pop() // last and/or
+      if (op === '!=') resArray.push('(', ...filterForStructProperty, ')')
+      else resArray.push(...filterForStructProperty)
+    }
   }
 
   if (resArray[resArray.length - 1] === 'and') {

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

@@ -520,6 +520,17 @@ class JoinCQNFromExpanded {
 
         // REVISIT required for other cqn properties as well?
         this.adjustOrderBy(readToOneCQN.orderBy, mappings, column, tableAlias)
+
+        // In case active parent entity has orderBy with draft specific columns we need to add them to parent CQN
+        if (
+          readToOneCQN[IS_ACTIVE] &&
+          readToOneCQN.orderBy &&
+          column.as &&
+          (column.as === 'IsActiveEntity' || column.as === 'HasActiveEntity' || column.as === 'HasDraftEntity')
+        ) {
+          readToOneCQNCopy.orderBy = readToOneCQN.orderBy
+          this._addColumnsInCaseOrderByHasDraft(readToOneCQNCopy, readToOneCQN.columns[readToOneCQN.columns.length - 1])
+        }
       }
     }
 
@@ -551,6 +562,14 @@ class JoinCQNFromExpanded {
     }
   }
 
+  _addColumnsInCaseOrderByHasDraft(readToOneCQNCopy, column) {
+    readToOneCQNCopy.orderBy.forEach(order => {
+      if (order.as === column.as) {
+        readToOneCQNCopy.columns.push(column)
+      }
+    })
+  }
+
   /**
    * Follow the tree to get to the relevant config object.
    *
@@ -1132,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
@@ -1326,6 +1354,17 @@ class JoinCQNFromExpanded {
       }
     }
 
+    if (readToOneCQN[IS_ACTIVE] && readToOneCQN.columns.length > 0) {
+      readToOneCQN.columns.forEach(column => {
+        if (
+          column.as === `${parentAlias}_IsActiveEntity` ||
+          column.as === `${parentAlias}_HasActiveEntity` ||
+          column.as === `${parentAlias}_HasDraftEntity`
+        )
+          columns.push(column)
+      })
+    }
+
     const subSelect = Object.assign({}, readToOneCQN, { columns })
 
     const SELECT = { from: { SELECT: subSelect }, columns: outerColumns, distinct: true }

package/libx/_runtime/db/query/insert.js

@@ -1,4 +1,4 @@
-const { hasDeepInsert, getDeepInsertCQNs, cleanEmptyCompositionsOfMany } = require('../../common/composition')
+const { hasDeepInsert, getDeepInsertCQNs } = require('../../common/composition')
 const { getFlatArray, processCQNs } = require('../utils/deep')
 const { timestampToISO } = require('../data-conversion/timestamp')
 
@@ -15,7 +15,6 @@ const insert = executeInsertCQN => async (model, dbc, query, req) => {
     return getFlatArray(results)
   }
 
-  cleanEmptyCompositionsOfMany(model, query)
   return executeInsertCQN(model, dbc, query, user, locale, isoTs)
 }
 

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

@@ -96,7 +96,7 @@ class SelectBuilder extends BaseBuilder {
     }
 
     if (this._obj.SELECT.orderBy && this._obj.SELECT.orderBy.length) {
-      this._orderBy()
+      this._orderBy(noQuoting)
     }
 
     if (this._obj.SELECT.limit || this._obj.SELECT.one) {
@@ -373,7 +373,11 @@ class SelectBuilder extends BaseBuilder {
     this._outputObj.values.push(...values)
   }
 
-  _orderBy() {
+  _getOrderByElement(noQuoting, name, element) {
+    return (noQuoting ? name : this._quote(name)) + ' ' + (element.sort || 'asc').toUpperCase()
+  }
+
+  _orderBy(noQuoting) {
     const sqls = []
     this._outputObj.sql.push('ORDER BY')
     for (const element of this._obj.SELECT.orderBy) {
@@ -385,7 +389,7 @@ class SelectBuilder extends BaseBuilder {
         if (!columns.find(c => JSON.stringify(c.ref) === serialized)) {
           const toMatch = element.as || (element.ref && element.ref.length === 1 && element.ref[0])
           if (toMatch && columns.find(c => c.as === toMatch)) {
-            sqls.push(this._quote(toMatch) + ' ' + (element.sort || 'asc').toUpperCase())
+            sqls.push(this._getOrderByElement(noQuoting, toMatch, element))
             continue
           }
         }

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/fiori/generic/read.js

@@ -3,10 +3,8 @@ const { SELECT } = cds.ql
 
 const { cqn2cqn4sql, convertWhereExists } = require('../../common/utils/cqn2cqn4sql')
 const { getElementDeep } = require('../../common/utils/csn')
-
 const { DRAFT_COLUMNS, DRAFT_COLUMNS_MAP, SCENARIO } = require('../../common/constants/draft')
 const {
-  adaptStreamCQN,
   addColumnAlias,
   draftIsLocked,
   ensureDraftsSuffix,
@@ -18,8 +16,8 @@ const {
   filterKeys
 } = require('../utils/handler')
 const { deleteCondition, readAndDeleteKeywords, removeIsActiveEntityRecursively } = require('../utils/where')
-
 const { getColumns } = require('../../cds-services/services/utils/columns')
+const { adaptStreamCQN } = require('../../cds-services/adapter/odata-v4/utils/stream')
 
 const _findRootSubSelectFor = query => {
   if (query.SELECT.where) {

package/libx/_runtime/fiori/utils/handler.js

@@ -1,6 +1,5 @@
 const cds = require('../../cds')
 const { UPDATE, SELECT } = cds.ql
-const { removeIsActiveEntityRecursively, isActiveEntityRequested } = require('./where')
 const { getColumns } = require('../../cds-services/services/utils/columns')
 const { ensureNoDraftsSuffix, ensureDraftsSuffix, ensureUnlocalized } = require('../../common/utils/draft')
 const getTemplate = require('../../common/utils/template')
@@ -126,7 +125,7 @@ const getEnrichedCQN = (cqn, select, draftWhere, scenarioAlias, addLimitOrder =
   }
 
   if (select.distinct) {
-    cqn.distinct()
+    cqn.SELECT.distinct = true
   }
 
   const alias = (select.from && select.from.as) || scenarioAlias
@@ -249,14 +248,6 @@ const replaceRefWithDraft = ref => {
   ref[0] = ensureDraftsSuffix(ref[0])
 }
 
-const adaptStreamCQN = cqn => {
-  if (isActiveEntityRequested(cqn.SELECT.where)) {
-    cqn.SELECT.where = removeIsActiveEntityRecursively(cqn.SELECT.where)
-  } else {
-    replaceRefWithDraft(cqn.SELECT.from.ref)
-  }
-}
-
 const draftIsLocked = lastChangedAt => {
   // default timeout timer is 15 minutes
   const DRAFT_CANCEL_TIMEOUT_IN_MS = ((cds.env.drafts && cds.env.drafts.cancellationTimeout) || 15) * 60 * 1000
@@ -289,7 +280,6 @@ module.exports = {
   hasDraft,
   proxifyToNoDraftsName,
   addColumnAlias,
-  adaptStreamCQN,
   replaceRefWithDraft,
   getKeyProperty,
   filterKeys,

package/libx/_runtime/hana/conversion.js

@@ -46,7 +46,8 @@ const HANA_TYPE_CONVERSION_MAP = new Map([
   ['cds.Integer64', convertInt64ToString],
   ['cds.DateTime', convertToISONoMillis],
   ['cds.Timestamp', convertToISO],
-  ['cds.LargeString', convertToString]
+  ['cds.LargeString', convertToString],
+  ['cds.hana.CLOB', convertToString]
 ])
 
 if (cds.env.features.bigjs) {

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,9 +51,8 @@ function _getOutputParameters(stmt) {
 const BINARY_TYPES = {
   12: 'BINARY',
   13: 'VARBINARY',
-  25: 'CLOB',
-  26: 'NCLOB',
-  27: 'BLOB'
+  27: 'BLOB',
+  33: 'BSTRING'
 }
 
 function _getBinaries(stmt) {
@@ -68,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) {
@@ -91,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(() => {})
@@ -125,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/hana/search2cqn4sql.js

@@ -72,10 +72,7 @@ const search2cqn4sql = (query, entity, options) => {
   return query
 }
 
-const _getLocalizedAssociation = entity => {
-  const associations = entity.associations
-  return associations && associations.localized
-}
+const _getLocalizedAssociation = entity => entity.associations && entity.associations.localized
 
 // The inner join modifies the original SELECT ... FROM query and adds ambiguity,
 // therefore add the table/entity name (as a preceding element) to the columns ref

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)
 }
 
@@ -246,6 +251,7 @@ const run = async (
 
     LOG._warn && LOG.warn(sanitizedError)
 
+    // REVISIT: switch from innererror to reason in cds^6
     throw Object.assign(new Error(e.message), { statusCode: 502, innererror: sanitizedError })
   }
 
@@ -267,6 +273,7 @@ const run = async (
 
     LOG._warn && LOG.warn(sanitizedError)
 
+    // REVISIT: switch from innererror to reason in cds^6
     throw Object.assign(new Error(`Error during request to remote service: ${e.message}`), {
       statusCode: 502,
       innererror: sanitizedError
@@ -294,6 +301,8 @@ const run = async (
         : 'Request to remote service failed.'
       const sanitizedError = _getSanitizedError(contentJSON, requestConfig)
       LOG._warn && LOG.warn(sanitizedError)
+
+      // REVISIT: switch from innererror to reason in cds^6
       throw Object.assign(new Error(contentJSON.message), { statusCode: 502, innererror: sanitizedError })
     }
   }

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