@sap/cds 6.1.3 → 6.2.1

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

@@ -1,40 +1,25 @@
 const cds = require('../../cds')
 const { UPDATE, SELECT } = cds.ql
 
-const { getUpdateDraftAdminCQN, ensureDraftsSuffix, ensureNoDraftsSuffix, addColumnAlias } = require('../utils/handler')
-const { getKeysCondition } = require('../utils/where')
-const { getColumns } = require('../../cds-services/services/utils/columns')
-const { DRAFT_COLUMNS_CQN } = require('../../common/constants/draft')
-
-const _getSelectCQN = (model, { target: { name } }, keysCondition, checkUser = true) => {
-  const activeName = ensureNoDraftsSuffix(name)
-  const draftName = ensureDraftsSuffix(name)
-
-  const columns = [
-    ...addColumnAlias(
-      getColumns(model.definitions[activeName], { removeIgnore: true, filterVirtual: true }).map(obj => obj.name),
-      draftName
-    ),
-    ...DRAFT_COLUMNS_CQN
-  ]
-
-  if (checkUser) {
-    columns.push({ ref: ['DRAFT.DraftAdministrativeData', 'inProcessByUser'], as: 'draftAdmin_inProcessByUser' })
+const { getUpdateDraftAdminCQN, ensureDraftsSuffix } = require('../utils/handler')
+const { removeIsActiveEntityRecursively } = require('../utils/where')
+const { deepCopyArray } = require('../../common/utils/copy')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
+
+const _getSelectCQN = ({ query }) => {
+  const fromRef = deepCopyArray(query.UPDATE.entity.ref)
+  for (const item of fromRef) {
+    if (item.where) {
+      item.where = removeIsActiveEntityRecursively(item.where)
+    }
   }
+  fromRef[0].id = ensureDraftsSuffix(fromRef[0].id)
+  const from = { ref: fromRef }
 
-  // REVISIT: support navigation to one
-  return SELECT.one(draftName)
-    .columns(columns)
-    .join('DRAFT.DraftAdministrativeData')
-    .on([
-      { ref: [draftName, 'DraftAdministrativeData_DraftUUID'] },
-      '=',
-      { ref: ['DRAFT.DraftAdministrativeData', 'DraftUUID'] }
-    ])
-    .where(keysCondition)
+  return SELECT.from(from)
 }
 
-const _getUpdateDraftCQN = ({ query, target: { name } }, keysCondition) => {
+const _getUpdateDraftCQN = ({ query }, where, targetRef) => {
   const set = {}
 
   for (const entry in query.UPDATE.data) {
@@ -46,7 +31,23 @@ const _getUpdateDraftCQN = ({ query, target: { name } }, keysCondition) => {
   }
 
   if (set.IsActiveEntity) set.IsActiveEntity = false
-  return UPDATE(ensureDraftsSuffix(name)).data(set).where(keysCondition)
+
+  return UPDATE(targetRef).data(set).where(where)
+}
+
+const _joinDraftAdministrativeData = (selectResolved, target) => {
+  const columns = []
+  columns.push({ ref: ['DRAFT.DraftAdministrativeData', 'inProcessByUser'], as: 'draftAdmin_inProcessByUser' })
+  columns.push({ ref: [target, 'DraftAdministrativeData_DraftUUID'] })
+
+  return selectResolved
+    .columns(columns)
+    .join('DRAFT.DraftAdministrativeData')
+    .on([
+      { ref: [target, 'DraftAdministrativeData_DraftUUID'] },
+      '=',
+      { ref: ['DRAFT.DraftAdministrativeData', 'DraftUUID'] }
+    ])
 }
 
 /**
@@ -57,20 +58,31 @@ const _getUpdateDraftCQN = ({ query, target: { name } }, keysCondition) => {
  *
  * @param req
  */
-const _handler = async function (req) {
+const fioriGenericPatch = async function (req) {
   if (req.data.IsActiveEntity === true) req.reject(400, 'Patch can only be applied to a draft entity')
 
-  const keysCondition = getKeysCondition(req.target, req.data)
   const dbtx = cds.tx(req)
-  let result = await dbtx.run(_getSelectCQN(this.model, req, keysCondition))
+
+  const selectResolved = cqn2cqn4sql(_getSelectCQN(req), this.model)
+
+  const targetName = selectResolved.SELECT.from.ref[selectResolved.SELECT.from.ref.length - 1]
+  const alias = selectResolved.SELECT.from.as
+  const selectWithAdmin = _joinDraftAdministrativeData(selectResolved, alias || targetName)
+  const results = await dbtx.run(selectWithAdmin)
+
+  if (results.length === 0) req.reject(404)
+
+  const result = results[0]
 
   // Potential timeout scenario supported
   if (result.draftAdmin_inProcessByUser && result.draftAdmin_inProcessByUser !== req.user.id) {
     // REVISIT: security log?
     req.reject(403)
   }
-
-  const updateDraftCQN = _getUpdateDraftCQN(req, keysCondition)
+  const updateDraftCQN = _getUpdateDraftCQN(req, selectResolved.SELECT.where, {
+    ref: [targetName],
+    as: alias || targetName
+  })
   const updateDraftAdminCQN = getUpdateDraftAdminCQN(req, result.DraftAdministrativeData_DraftUUID)
 
   await Promise.all([dbtx.run(updateDraftCQN), dbtx.run(updateDraftAdminCQN)])
@@ -80,5 +92,5 @@ const _handler = async function (req) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('PATCH', entity, _handler)
+  srv.on('PATCH', entity, fioriGenericPatch)
 })

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

@@ -11,7 +11,7 @@ const { getColumns } = require('../../cds-services/services/utils/columns')
  *
  * @param req
  */
-const _handler = async function (req) {
+const fioriGenericPrepare = async function (req) {
   if (req.query.SELECT.from.ref.length > 1 || isActiveEntityRequested(req.query.SELECT.from.ref[0].where || [])) {
     req.reject(400, 'Action "draftPrepare" can only be called on a draft entity')
   }
@@ -44,5 +44,5 @@ const _handler = async function (req) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('draftPrepare', entity, _handler)
+  srv.on('draftPrepare', entity, fioriGenericPrepare)
 })

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

@@ -4,6 +4,7 @@ const { SELECT } = cds.ql
 const { cqn2cqn4sql, convertWhereExists } = require('../../common/utils/cqn2cqn4sql')
 const { getElementDeep } = require('../../common/utils/csn')
 const { DRAFT_COLUMNS_MAP, SCENARIO } = require('../../common/constants/draft')
+const { filterNonDraftColumns } = require('../../common/utils/draft')
 const {
   addColumnAlias,
   draftIsLocked,
@@ -16,15 +17,11 @@ 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 _findSubselect = where => {
   return where.find((e, i) => {
-    if (e.xpr) {
-      return _findSubselect(e.xpr)
-    }
-
+    if (e.xpr) return _findSubselect(e.xpr)
     return e.SELECT && where[i - 1] === 'exists'
   })
 }
@@ -626,6 +623,9 @@ const _siblingEntity = (
 
   if (siblingIndex === 0) {
     const columnCqnPartial = columns.map(col => {
+      if (col.val) {
+        return Object.assign({}, col)
+      }
       const colName = col.ref ? col.ref[col.ref.length - 1] : col
       const ref = col.ref ? [table.as, ...col.ref] : [table.as, colName]
       return Object.assign({}, col, { ref })
@@ -694,7 +694,7 @@ function _siblingSubScenario(nav, siblingIndex, siblingQuery, target, params, mo
     const existsIdx = siblingQuery.SELECT.where.indexOf('exists')
     if (existsIdx > -1) subReq.query.where(siblingQuery.SELECT.where.slice(existsIdx, existsIdx + 2))
     const subOrigFrom = { ref: [...subNav].reverse() }
-    subScenario = _generateCQN(subOrigFrom, subReq, [{ val: 1 }], model)
+    subScenario = _generateCQN(subReq, [{ val: 1 }], subOrigFrom, model)
     subScenario.cqn.where(onCond)
   }
 
@@ -757,9 +757,8 @@ const _replaceWhereExists = (query, _siblingIndex, siblingCQN) => {
   }
 }
 
-const _mergeSiblingIntoCQN = (cqn, { cqn: siblingCQN }, siblingIndex) => {
-  return _replaceWhereExists(cqn, siblingIndex, siblingCQN)
-}
+const _mergeSiblingIntoCQN = (cqn, { cqn: siblingCQN }, siblingIndex) =>
+  _replaceWhereExists(cqn, siblingIndex, siblingCQN)
 
 const _getDraftDoc = (req, draftName, draftWhere) => {
   const refDraft = req.query.SELECT.from.as ? { ref: [draftName], as: req.query.SELECT.from.as } : draftName
@@ -784,8 +783,10 @@ const _getDraftDoc = (req, draftName, draftWhere) => {
 
 const _getOrderByEnrichedColumns = (orderBy, columns, entity) => {
   const enrichedCol = []
+
   if (orderBy && orderBy.length > 1) {
     const colNames = columns.map(el => el.ref[el.ref.length - 1])
+
     // REVISIT: GET Books?$select=title&$expand=NotBooks($select=pages)&$orderby=NotBooks/title - what's then?
     for (const el of orderBy) {
       // For associations we need to 'materialise' the resulting field, otherwise we cannot access it in an outer SELECT.
@@ -906,11 +907,11 @@ const _getUnionCQN = (req, draftName, columns, subSelect, draftWhere, model, ent
   }
 
   return union
-    .columns(...columns)
+    .columns(...columns.map(ref => (ref.as ? { ref: [ref.as], as: ref.as } : ref))) // needed for aliased stream property ref@odata.mediaContentType
     .columns(..._filterDraftColumnsBySelected(DRAFT_COLUMNS_CASTED, req.query.SELECT.columns))
 }
 
-const _excludeActiveDraftExists = (req, draftWhere, columns, model) => {
+const _excludeActiveDraftExists = (req, columns, draftWhere, model) => {
   const { table, name } = _getTableName(req, true)
   const draftName = table.ref[0]
 
@@ -964,8 +965,9 @@ const _validatedWithSiblingInProcess = (req, draftWhere, draftParameters, column
   if (
     !draftInProcessByUser &&
     _isValidExcludeActiveDraftExists(draftParameters.isActiveEntity, draftParameters.siblingIsActive)
-  )
-    return _excludeActiveDraftExists(req, draftWhere, columns, model)
+  ) {
+    return _excludeActiveDraftExists(req, columns, draftWhere, model)
+  }
 
   if (
     draftInProcessByUser &&
@@ -1005,8 +1007,8 @@ const _draftInSubSelect = (where, req) => {
 const _isDraftAdminScenario = req =>
   req.target.query && req.target.query._target && req.target.query._target.name === 'DRAFT.DraftAdministrativeData'
 
-const _generateCQN = (originalFrom, req, columns, model) => {
-  const nav = [...originalFrom.ref].reverse() || []
+const _generateCQN = (req, columns, from, model) => {
+  const nav = [...from.ref].reverse() || []
   let siblingIndex = nav.indexOf('SiblingEntity')
 
   // it can also be a property access (new parser), then we must shift it
@@ -1018,20 +1020,12 @@ const _generateCQN = (originalFrom, req, columns, model) => {
   let siblingScenario
   if (siblingIndex > -1) {
     siblingScenario = _getSiblingScenario(req, columns, model, siblingIndex, nav)
-    if (siblingIndex === 0) {
-      return siblingScenario
-    }
-
+    if (siblingIndex === 0) return siblingScenario
     _mergeSiblingIntoCQN(req.query, siblingScenario, siblingIndex - 1)
   }
 
-  if (_isDraftAdminScenario(req)) {
-    return _draftAdminTable(req)
-  }
-
-  if (!req.query.SELECT.where) {
-    return _allActive(req, columns)
-  }
+  if (_isDraftAdminScenario(req)) return _draftAdminTable(req)
+  if (!req.query.SELECT.where) return _allActive(req, columns)
 
   // REVISIT this function does not only read, but modifies where!
   const draftParameters = _readDraftParameters(req.query.SELECT.where)
@@ -1065,11 +1059,6 @@ const _generateCQN = (originalFrom, req, columns, model) => {
   return _validatedDraftOfWhichIAmOwner(req, req.query.SELECT.where, draftParameters, columns)
 }
 
-const _getColumns = ({ query: { SELECT } }) =>
-  SELECT.columns.filter(
-    col => (col.ref && !(col.ref[col.ref.length - 1] in DRAFT_COLUMNS_MAP)) || (!col.ref && !(col in DRAFT_COLUMNS_MAP))
-  )
-
 const _isIsActiveEntity = element => element.ref && element.ref[element.ref.length - 1] === 'IsActiveEntity'
 
 const _adaptSubSelects = ({ SELECT: { from, where } }, scenario) => {
@@ -1182,6 +1171,7 @@ const _setLastSubQuery = (query, last, prev = query) => {
 const _adaptDraftAdminExpand = cqn => {
   const draftAdminExpand =
     cqn.SELECT.columns && cqn.SELECT.columns.find(c => c.expand && c.ref[0] === 'DraftAdministrativeData')
+
   if (draftAdminExpand) {
     _ensureDraftAdminColumnsForCalculation(draftAdminExpand.expand)
   }
@@ -1274,7 +1264,7 @@ const _adaptColumns4readAfterWrite = (req, cqnScenario, query4sql) => {
  *
  * @param req
  */
-const _handler = async function (req) {
+const fioriGenericRead = async function (req) {
   const query = req.query
   const originalFrom = _copyCQNPartial(query.SELECT.from)
 
@@ -1299,12 +1289,12 @@ const _handler = async function (req) {
   // just to make existing tests working with new parser. not really tested, not needed to be supported
   if (reqClone.query.SELECT.from.SELECT) {
     const subQueryReq = { __proto__: req, query: _copyCQNPartial(_getLastSubQuery(reqClone.query)) }
-    const columns = _getColumns(subQueryReq)
-    cqnScenario = _generateCQN(originalFrom.SELECT.from, subQueryReq, columns, this.model)
+    const nonDraftColumns = filterNonDraftColumns(subQueryReq.query.SELECT.columns)
+    cqnScenario = _generateCQN(subQueryReq, nonDraftColumns, originalFrom.SELECT.from, this.model)
     cqnScenario.cqn = _setLastSubQuery(reqClone.query, cqnScenario.cqn)
   } else {
-    const columns = _getColumns(reqClone)
-    cqnScenario = _generateCQN(originalFrom, reqClone, columns, this.model)
+    const nonDraftColumns = filterNonDraftColumns(reqClone.query.SELECT.columns)
+    cqnScenario = _generateCQN(reqClone, nonDraftColumns, originalFrom, this.model)
   }
 
   if (!cqnScenario) req.reject(400)
@@ -1334,5 +1324,5 @@ const _handler = async function (req) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('READ', entity, _handler)
+  srv.on('READ', entity, fioriGenericRead)
 })

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

@@ -210,11 +210,13 @@ const extractKeyConditions = whereCondition => {
   return result
 }
 
-const getKeysCondition = (target, data) => {
+const getKeysCondition = req => {
+  const data = req.data
+  const target = req.target
   const where = []
   for (const k in target.keys) {
     const key = target.keys[k]
-    if (!key.isAssociation && key.name !== 'IsActiveEntity') {
+    if (!key.isAssociation && key.name !== 'IsActiveEntity' && data[key.name] != undefined) {
       if (where.length) where.push('and')
       where.push({ ref: [key.name] }, '=', { val: data[key.name] })
     }

package/libx/_runtime/hana/Service.js

@@ -163,10 +163,8 @@ class HanaDatabase extends DatabaseService {
   }
 
   // REVISIT: should happen automatically after a configurable time
-  // poolOnly: private param for mtx
-  async disconnect(tenant, poolOnly) {
+  async disconnect(tenant) {
     await pool.drain(tenant)
-    if (!poolOnly) super.disconnect(tenant)
   }
 }
 

package/libx/_runtime/hana/conversion.js

@@ -55,6 +55,7 @@ const convertToString = element => {
 const HANA_TYPE_CONVERSION_MAP = new Map([
   ['cds.Boolean', convertToBoolean],
   ['cds.Integer64', convertInt64ToString],
+  ['cds.Int64', convertInt64ToString],
   ['cds.DateTime', convertToISONoMillis],
   ['cds.Timestamp', convertToISO],
   ['cds.LargeString', convertToString],
@@ -62,10 +63,12 @@ const HANA_TYPE_CONVERSION_MAP = new Map([
 ])
 
 if (cds.env.features.bigjs) {
+  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
   const Big = require('big.js')
   const convertToBig = value => new Big(value)
 
   HANA_TYPE_CONVERSION_MAP.set('cds.Integer64', convertToBig)
+  HANA_TYPE_CONVERSION_MAP.set('cds.Int64', convertToBig)
   HANA_TYPE_CONVERSION_MAP.set('cds.Decimal', convertToBig)
 }
 

package/libx/_runtime/hana/driver.js

@@ -129,9 +129,37 @@ function _connectHanaClient(creds, tenant) {
 
 let driver
 
-const _getHanaDriver = (name = 'hdb') => {
+const _getHanaDriver = name => {
   if (driver) return driver
 
+  let isConfigured = false
+  if (!name) {
+    let packageJson
+    try {
+      packageJson = require(cds.root + '/package.json')
+    } catch (e) {
+      LOG._debug && LOG.debug(`Could not find package.json. Trying to lookup hana driver automatically.`)
+      name = 'hdb'
+    }
+
+    if (packageJson?.dependencies?.hdb) {
+      LOG._debug && LOG.debug(`"hdb" found in dependencies of "${cds.root}".`)
+      name = 'hdb'
+      isConfigured = true
+    } else if (packageJson?.dependencies?.['@sap/hana-client']) {
+      LOG._debug && LOG.debug(`"@sap/hana-client" found in dependencies of "${cds.root}".`)
+      name = '@sap/hana-client'
+      isConfigured = true
+    } else if (!name) {
+      LOG._debug &&
+        LOG.debug(
+          `Neither "hdb" nor "@sap/hana-client" found in dependencies of "${cds.root}". Trying to lookup hana driver automatically.`
+        )
+      // fallback to hdb in case both are not provided, which will fallback to @sap/hana-client if hdb is not installed
+      name = 'hdb'
+    }
+  }
+
   try {
     driver = Object.assign({ name }, require(name))
 
@@ -161,9 +189,11 @@ const _getHanaDriver = (name = 'hdb') => {
 
     return driver
   } catch (e) {
-    if (name === 'hdb') {
+    if (name === 'hdb' && !isConfigured) {
       LOG._debug && LOG.debug(`Failed to require "hdb" with error "${e.message}". Trying "@sap/hana-client" next.`)
       return _getHanaDriver('@sap/hana-client')
+    } else if (isConfigured) {
+      throw new Error(`"${name}" could not be required. Please make sure it is installed.`)
     } else {
       throw new Error(
         'Neither "hdb" nor "@sap/hana-client" could be required. Please make sure one of them is installed.'
@@ -172,4 +202,4 @@ const _getHanaDriver = (name = 'hdb') => {
   }
 }
 
-module.exports = _getHanaDriver('hdb')
+module.exports = _getHanaDriver()

package/libx/_runtime/hana/dynatrace.js

@@ -1,5 +1,6 @@
 const dynatrace = {}
 try {
+  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
   dynatrace.sdk = require('@dynatrace/oneagent-sdk')
   dynatrace.api = dynatrace.sdk.createInstance()
 } catch (err) {

package/libx/_runtime/hana/search2Contains.js

@@ -59,7 +59,7 @@ const search2Contains = (cqnSearchPhrase, columns) => {
   return expression
 }
 
-const isContainsPredicateSupported = query => {
+const isContainsPredicateSupported = (query, entity, columns2Search) => {
   const cqnSearchPhrase = query.SELECT.search
 
   if (cqnSearchPhrase && cqnSearchPhrase[0] && cqnSearchPhrase[0].val === ' ') return false
@@ -84,9 +84,20 @@ const isContainsPredicateSupported = query => {
   // brackets are not supported as search operators in SAP HANA
   if (cqnSearchPhrase.some(searchXpr => searchXpr.xpr)) return false
 
+  // join not optimized
+  if (entity.query?.SELECT.from.join) return false
+
+  // the CONTAINS function does not interoperate with columns that use the CONCAT function
+  if (_isColumnFunc(columns2Search, entity.query?.SELECT.columns)) return false
   return true
 }
 
+const _isColumnFunc = (columns2Search, columnsDefs) =>
+  columns2Search.some(column2Search => {
+    if (column2Search.func) return true
+    return columnsDefs?.some(columnDef => columnDef.func && columnDef.as === column2Search.ref[0])
+  })
+
 module.exports = {
   isContainsPredicateSupported,
   search2Contains

package/libx/_runtime/hana/search2cqn4sql.js

@@ -25,35 +25,29 @@ const search2cqn4sql = (query, entity, options) => {
   if (!cqnSearchPhrase) return query
 
   let { columns: columns2Search = computeColumnsToBeSearched(query, entity), locale } = options
-  const localizedAssociation = _getLocalizedAssociation(entity)
+  const localizedAssociation = entity.associations?.localized
 
-  // If the localized association is defined for the target entity,
-  // there should be at least one localized element.
-  const resolveLocalizedDataAtRuntime = !!localizedAssociation
-
-  // suppress the localize handler from redirecting the query's target to the localized view
-  Object.defineProperty(query, '_suppressLocalization', { value: true })
-
-  const columnsDefs = entity.query && entity.query.SELECT.columns
-  const isSomeColumn2SearchUseFunction = _isSomeColumn2SearchAFunction(columns2Search, columnsDefs)
-
-  if (resolveLocalizedDataAtRuntime) {
+  // Resolve localized data at runtime if the localized association is defined for the target entity.
+  // Notice that if the localized association is defined, there should be at least one localized element.
+  if (localizedAssociation) {
     const onCondition = entity._relations[localizedAssociation.name].join(localizedAssociation.target, entity.name)
 
     // REVISIT this is dirty but works for now
     // replace $user_locale placeholder with the user locale or the HANA session context
     onCondition[0].xpr[onCondition[0].xpr.length - 1] = { val: locale || "SESSION_CONTEXT('LOCALE')" }
 
-    // inner join the target table with the _texts table (the _texts table contains
-    // the translated texts)
+    // inner join the target table with the _texts table (the _texts table contains the translated texts)
     const localizedEntityName = localizedAssociation.target
     query.join(localizedEntityName).on(onCondition)
 
     // prevent SQL ambiguity error for columns with the same name
     columns2Search = _addAliasToQuery(query, entity, columns2Search)
+
+    // suppress the localize handler from redirecting the query's target to the localized view
+    Object.defineProperty(query, '_suppressLocalization', { value: true })
   } // else --> resolve localized texts via localized view (default)
 
-  const useContains = !isSomeColumn2SearchUseFunction && isContainsPredicateSupported(query)
+  const useContains = !!localizedAssociation && isContainsPredicateSupported(query, entity, columns2Search)
   let expression
 
   if (useContains) {
@@ -70,23 +64,12 @@ const search2cqn4sql = (query, entity, options) => {
   return query
 }
 
-const _isSomeColumn2SearchAFunction = (columns2Search, columnsDefs) =>
-  columns2Search.some(column2Search => {
-    if (column2Search.func) return true
-    return columnsDefs && columnsDefs.some(columnDef => columnDef.func && columnDef.as === column2Search.ref[0])
-  })
-
-const _getLocalizedAssociation = entity => {
-  const associations = entity.associations
-  return associations && 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
 // to prevent a SQL ambiguity error.
 const _addAliasToQuery = (query, entity, columnsToBeSearched) => {
   const SELECT = query.SELECT
-  const localizedEntityName = _getLocalizedAssociation(entity).target
+  const localizedEntityName = entity.associations?.localized.target
   const elements = entity.elements
   const entityName = entity.name
   const getEntityName = columnRef => {

package/libx/_runtime/hana/streaming.js

@@ -9,6 +9,7 @@ const STREAM_PLACEHOLDER = '[<stream>]'
 const _loadStreamExtensionIfNeeded = () => {
   const hana = require('./driver')
   if (hana.name !== 'hdb') {
+    // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
     const extension = require('@sap/hana-client/extension/Stream.js')
     return isDynatraceEnabled() ? dynatraceStreamingExtension(extension) : extension
   }

package/libx/_runtime/messaging/AMQPWebhookMessaging.js

@@ -39,8 +39,10 @@ class AMQPWebhookMessaging extends MessagingService {
 
   startListening(opt = {}) {
     if (!this.subscribedTopics.size) return
-    const management = this.getManagement()
-    if (!opt.doNotDeploy) this.queued(management.createQueueAndSubscriptions.bind(management))()
+    if (!opt.doNotDeploy) {
+      const management = this.getManagement()
+      this.queued(management.createQueueAndSubscriptions.bind(management))()
+    }
     this.queued(this.listenToClient.bind(this))(async (_topic, _payload, _other, { done, failed }) => {
       const msg = Object.assign(normalizeIncomingMessage(_payload), _other || {})
       msg.event = _topic

package/libx/_runtime/messaging/common-utils/AMQPClient.js

@@ -1,4 +1,5 @@
 const cds = require('../../cds.js')
+// eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
 const ClientAmqp = require('@sap/xb-msg-amqp-v100').Client
 const { connect, disconnect } = require('./connections')
 const { hasPersistentOutbox } = require('../outbox/utils')

package/libx/_runtime/messaging/enterprise-messaging-utils/getTenantInfo.js

@@ -2,11 +2,14 @@ const cds = require('../../cds')
 const _transform = o => ({ subdomain: o.subscribedSubdomain, tenant: o.subscribedTenantId })
 
 const getTenantInfo = async tenant => {
-  const provisioning = await cds.connect.to('ProvisioningService')
+  const provisioningServiceName = cds.mtx ? 'ProvisioningService' : 'cds.xt.SaasProvisioningService'
+  const primaryKey = cds.mtx ? 'ID' : 'subscribedTenantId'
+
+  const provisioning = await cds.connect.to(provisioningServiceName)
   const tx = provisioning.tx({ user: new cds.User.Privileged() })
   try {
     const result = tenant
-      ? _transform(await tx.get(`tenant`, { ID: tenant }))
+      ? _transform(await tx.get(`tenant`, { [primaryKey]: tenant }))
       : (await tx.read('tenant')).map(o => _transform(o))
     await tx.commit()
     return result

package/libx/_runtime/messaging/enterprise-messaging-utils/registerEndpoints.js

@@ -1,4 +1,5 @@
 const cds = require('../../cds.js')
+// eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
 const express = require('express')
 const getTenantInfo = require('./getTenantInfo.js')
 const isSecured = () => cds.requires.auth && cds.requires.auth.credentials
@@ -14,6 +15,7 @@ class EndpointRegistry {
     this.deployCallbacks = new Map()
     if (isSecured()) {
       const JWTStrategy = require('../../auth/strategies/JWT.js')
+      // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
       const passport = require('passport')
       // REVISIT: It's unclear if the credentials from cds.requires.auth need to be used here.
       //          In principle, user-facing endpoints might differ from messaging ones.