@sap/cds 6.1.2 → 6.2.1

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

@@ -3,30 +3,14 @@ const cds = require('../../cds')
 const { SELECT } = cds.ql
 
 const { isNavigationToMany } = require('../utils/req')
-const { getKeysCondition } = require('../utils/where')
+const { getKeysCondition, removeIsActiveEntityRecursively } = require('../utils/where')
 const { isDraftActivateAction, ensureNoDraftsSuffix, ensureDraftsSuffix, draftIsLocked } = require('../utils/handler')
 
-const { isCustomOperation } = require('../../cds-services/adapter/odata-v4/utils/request')
-
 const { DRAFT_COLUMNS_ADMIN_MAP } = require('../../common/constants/draft')
+const { deepCopyArray } = require('../../common/utils/copy')
 const DRAFT_COLUMNS_ADMIN = Object.keys(DRAFT_COLUMNS_ADMIN_MAP)
 const PREFIX_DRAFT_COLUMNS = DRAFT_COLUMNS_ADMIN.map(col => ({ ref: ['DRAFT_DraftAdministrativeData', col] }))
 
-// copied from adapter/odata-v4/utils/context-object
-const _getTargetEntityName = (service, pathSegments) => {
-  if (isCustomOperation(pathSegments, false)) return
-
-  let navSegmentName
-  let entityName = `${service.name}.${pathSegments[0].getEntitySet().getName()}`
-
-  for (const navSegment of pathSegments.filter(segment => segment.getNavigationProperty() !== null)) {
-    navSegmentName = navSegment.getNavigationProperty().getName()
-    entityName = service.model.definitions[entityName].elements[navSegmentName].target
-  }
-
-  return entityName
-}
-
 /**
  * Provide information about the parent entity, i.e. the entity that has the to-many composition element.
  * Limitation: only works for one key (besides IsActiveEntity)
@@ -36,34 +20,6 @@ const _getTargetEntityName = (service, pathSegments) => {
  * @returns {object}
  * @private
  */
-const _getParent = (req, service) => {
-  // REVISIT: get rid of getUriInfo
-  if (!req.getUriInfo) return
-
-  const segments = req.getUriInfo().getPathSegments()
-  if (segments.length === 1) return
-
-  const parent = {
-    entityName: _getTargetEntityName(service, segments.slice(0, segments.length - 1))
-  }
-
-  const parentKeyPredicates = segments[segments.length - 2].getKeyPredicates()
-  let keyPredicateName, keyPredicateText
-
-  for (const keyPredicate of parentKeyPredicates) {
-    keyPredicateName = keyPredicate.getEdmRef().getName()
-    keyPredicateText = keyPredicate.getText()
-
-    if (keyPredicateName === 'IsActiveEntity') {
-      parent.IsActiveEntity = keyPredicateText === 'true'
-    } else {
-      parent.keyName = keyPredicateName
-      parent.keyValue = keyPredicateText
-    }
-  }
-
-  return parent
-}
 
 const _validateDraft = (req, draftResult, isBoundAction) => {
   if (!draftResult || draftResult.length === 0) req.reject(404)
@@ -102,36 +58,48 @@ const _getSelectDraftDataCqn = (entityName, where) => {
     .where(where)
 }
 
-const _getDraftDataFromExistingDraft = async (req, service, parent = _getParent(req, service)) => {
-  if (parent) {
-    if (parent.IsActiveEntity === false) {
-      const parentWhere = [{ ref: [parent.keyName] }, '=', { val: parent.keyValue }]
-      const query = _getSelectDraftDataCqn(parent.entityName, parentWhere)
-      const result = await cds.tx(req).run(query)
-      return result
+const _getRoot = req => {
+  if (!req.query) return
+  const refObj = req.query.SELECT?.from || req.query.UPDATE?.entity || req.query.INSERT?.into || req.query.DELETE?.from
+  const root = {
+    entityName: ensureDraftsSuffix(refObj.ref[0].id),
+    where: removeIsActiveEntityRecursively(deepCopyArray(refObj.ref[0].where))
+  }
+
+  for (const item of refObj.ref[0].where) {
+    if (item.ref && item.ref[item.ref.length - 1] === 'IsActiveEntity') {
+      const index = refObj.ref[0].where.indexOf(item)
+      root.IsActiveEntity = refObj.ref[0].where[index + 2].val
+      break
     }
+  }
+
+  return root
+}
 
-    return []
+const _getDraftDataFromExistingDraft = async (req, root) => {
+  if (!root) return []
+  if (root?.IsActiveEntity === false) {
+    const query = _getSelectDraftDataCqn(root.entityName, root.where)
+    const result = await cds.tx(req).run(query)
+    return result
   }
 
-  const rootWhere = getKeysCondition(req.target, req.data)
+  const rootWhere = getKeysCondition(req)
   const query = _getSelectDraftDataCqn(ensureNoDraftsSuffix(req.target.name), rootWhere)
   const result = await cds.tx(req).run(query)
   return result
 }
 
-const _addDraftDataFromExistingDraft = async (req, service) => {
-  const parent = _getParent(req, service)
-  const result = await _getDraftDataFromExistingDraft(req, service, parent)
-
-  if (parent) {
-    if (parent.IsActiveEntity === false) {
-      _validateDraft(req, result)
-      _addDraftDataToContext(req, result)
-      return result
-    }
+const _addDraftDataFromExistingDraft = async req => {
+  const root = _getRoot(req)
+  const result = await _getDraftDataFromExistingDraft(req, root)
 
-    return []
+  if (!root) return []
+  if (root.IsActiveEntity === false) {
+    _validateDraft(req, result)
+    _addDraftDataToContext(req, result)
+    return result
   }
 
   if (result && result.length > 0) _validateDraft(req, result)
@@ -147,7 +115,7 @@ const _new = async function (req) {
 
   if (isNavigationToMany(req)) {
     // REVISIT: How can NEW be a navigation to many?
-    const result = await _addDraftDataFromExistingDraft(req, this)
+    const result = await _addDraftDataFromExistingDraft(req)
 
     // in order to fix corner case where active subitems are created in draft case
     if (result.length === 0) req.reject(404)
@@ -165,7 +133,7 @@ const _new = async function (req) {
 const _patchUpdate = async function (req) {
   if (isDraftActivateAction(req)) return
 
-  const result = await _addDraftDataFromExistingDraft(req, this)
+  const result = await _addDraftDataFromExistingDraft(req)
 
   // means that the draft does not exists
   if (result.length === 0) req.reject(404)
@@ -175,11 +143,11 @@ const _patchUpdate = async function (req) {
  * Generic Handler for before DELETE and CANCEL requests.
  */
 const _deleteCancel = async function (req) {
-  await _addDraftDataFromExistingDraft(req, this)
+  await _addDraftDataFromExistingDraft(req)
 }
 
-const _validateDraftBoundAction = async function (req, srv) {
-  const result = await _getDraftDataFromExistingDraft(req, srv)
+const _validateDraftBoundAction = async function (req) {
+  const result = await _getDraftDataFromExistingDraft(req, _getRoot(req))
   const isBoundAction = true
   if (result && result.length > 0) _validateDraft(req, result, isBoundAction)
 }
@@ -196,7 +164,7 @@ const _registerBoundActionHandlers = function (entityName, actions) {
   )
 
   for (const action of boundActions) {
-    this.before(action.name, entityName, req => _validateDraftBoundAction(req, this))
+    this.before(action.name, entityName, req => _validateDraftBoundAction(req))
   }
 }
 

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

@@ -8,10 +8,10 @@ const { deleteDraft } = require('../utils/delete')
  *
  * @param req
  */
-const _handler = function (req) {
+const fioriGenericCancel = function (req) {
   return deleteDraft(req, this)
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('CANCEL', entity, _handler)
+  srv.on('CANCEL', entity, fioriGenericCancel)
 })

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

@@ -8,12 +8,12 @@ const { deleteDraft } = require('../utils/delete')
  *
  * @param req
  */
-const _handler = function (req) {
+const fioriGenericDelete = function (req) {
   // we should call deleteDraft only for draft tables and call next
   // to pass delete of active tables to our general implementation
   return deleteDraft(req, this, true)
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('DELETE', entity, _handler)
+  srv.on('DELETE', entity, fioriGenericDelete)
 })

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

@@ -68,7 +68,7 @@ const _select = async (lockRecordCQN, draftExistsCQN, selectCQNs, req, dbtx) =>
  *
  * @param req
  */
-const _handler = async function (req) {
+const fioriGenericEdit = async function (req) {
   if (!isActiveEntityRequested(req.query.SELECT.where || [])) {
     req.reject(400)
   }
@@ -160,5 +160,5 @@ const _handler = async function (req) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('EDIT', entity, _handler)
+  srv.on('EDIT', entity, fioriGenericEdit)
 })

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

@@ -1,11 +1,9 @@
 const cds = require('../../cds')
-const { INSERT, SELECT, UPDATE } = cds.ql
+const { INSERT, UPDATE } = cds.ql
 
 const onDraftActivate = require('./activate')._handler
 const { isNavigationToMany } = require('../utils/req')
-const { getKeysCondition } = require('../utils/where')
 const { ensureDraftsSuffix } = require('../utils/handler')
-const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getUpdateDraftAdminCQN = ({ user, timestamp }, draftUUID) => {
   return UPDATE('DRAFT.DraftAdministrativeData')
@@ -50,7 +48,7 @@ const _getInsertDataCQN = (req, draftUUID) => {
  * @param req
  * @param next
  */
-const _handler = async function (req, next) {
+const fioriGenericNew = async function (req, next) {
   if (!req._draftMetadata) {
     // REVISIT: when is this the case?
     return onDraftActivate(req, next)
@@ -72,5 +70,5 @@ const _handler = async function (req, next) {
 }
 
 module.exports = cds.service.impl(function (srv, entity) {
-  srv.on('NEW', entity, _handler)
+  srv.on('NEW', entity, fioriGenericNew)
 })

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

@@ -1,46 +1,25 @@
 const cds = require('../../cds')
 const { UPDATE, SELECT } = cds.ql
 
-const {
-  getUpdateDraftAdminCQN,
-  removeDraftUUIDIfNecessary,
-  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) {
@@ -52,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'] }
+    ])
 }
 
 /**
@@ -63,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)])
@@ -86,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)
 }