@sap/cds 5.8.2 → 5.9.0

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

@@ -5,7 +5,7 @@ const onDraftActivate = require('./activate')._handler
 const { isNavigationToMany } = require('../utils/req')
 const { getKeysCondition } = require('../utils/where')
 const { removeDraftUUIDIfNecessary, ensureDraftsSuffix } = require('../utils/handler')
-const { DRAFT_COLUMNS } = require('../../common/constants/draft')
+const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 const _getUpdateDraftAdminCQN = ({ user, timestamp }, draftUUID) => {
   return UPDATE('DRAFT.DraftAdministrativeData')
@@ -60,7 +60,7 @@ const _handler = async function (req, next) {
   const elements = req.target.elements
   for (const column in elements) {
     const col = elements[column]
-    if (col.default !== undefined && !DRAFT_COLUMNS.includes(column)) {
+    if (col.default !== undefined && !(column in DRAFT_COLUMNS_MAP)) {
       if ('val' in col.default) req.data[col.name] = col.default.val
       else if ('ref' in col.default) req.data[col.name] = col.default.ref[0]
       else req.data[col.name] = col.default
@@ -91,7 +91,7 @@ const _handler = async function (req, next) {
     req.reject(404)
   }
 
-  removeDraftUUIDIfNecessary(result[0], req)
+  removeDraftUUIDIfNecessary(req)(result[0])
 
   return result[0]
 }

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

@@ -82,7 +82,7 @@ const _handler = async function (req) {
   await Promise.all([dbtx.run(updateDraftCQN), dbtx.run(updateDraftAdminCQN)])
   result = await dbtx.run(_getSelectCQN(this.model, req, keysCondition, false))
   if (result.length === 0) req.reject(404)
-  removeDraftUUIDIfNecessary(result[0], req)
+  removeDraftUUIDIfNecessary(req)(result[0])
   return result[0]
 }
 

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

@@ -3,7 +3,7 @@ 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 { DRAFT_COLUMNS_MAP, SCENARIO } = require('../../common/constants/draft')
 const {
   addColumnAlias,
   draftIsLocked,
@@ -786,7 +786,7 @@ const _getOrderByEnrichedColumns = (orderBy, columns, entity) => {
       // For associations we need to 'materialise' the resulting field, otherwise we cannot access it in an outer SELECT.
       if (entity && entity.elements[el.ref[0]] && entity.elements[el.ref[0]].isAssociation) {
         enrichedCol.push({ ref: [...el.ref], as: _poorMansAlias4(el) })
-      } else if (!DRAFT_COLUMNS.includes(el.ref[el.ref.length - 1]) && !colNames.includes(el.ref[el.ref.length - 1])) {
+      } else if (!(el.ref[el.ref.length - 1] in DRAFT_COLUMNS_MAP) && !colNames.includes(el.ref[el.ref.length - 1])) {
         enrichedCol.push({ ref: [...el.ref] })
       }
     }
@@ -844,7 +844,9 @@ const _getUnionCQN = (req, draftName, columns, subSelect, draftWhere, model, ent
   for (const col of enrichedColumns) {
     // if we have columns for outer order by that may also be needed for joins, we need to duplicate them
     const element = getElementDeep(req.target, col.ref)
-    if (element && element['@odata.foreignKey4']) columns.push({ ref: [...col.ref] })
+    if (element && element._foreignKey4) {
+      columns.push({ ref: [...col.ref] })
+    }
 
     col.as = _poorMansAlias4(col)
     // add alias to outer order by
@@ -1059,8 +1061,7 @@ const _getColumns = ({ query: { SELECT }, target }, model) => {
   return SELECT.columns
     ? SELECT.columns.filter(
         col =>
-          (col.ref && !DRAFT_COLUMNS.includes(col.ref[col.ref.length - 1])) ||
-          (!col.ref && !DRAFT_COLUMNS.includes(col))
+          (col.ref && !(col.ref[col.ref.length - 1] in DRAFT_COLUMNS_MAP)) || (!col.ref && !(col in DRAFT_COLUMNS_MAP))
       )
     : getColumns(target, { onlyNames: true, removeIgnore: true })
 }
@@ -1100,20 +1101,14 @@ const _adaptSubSelects = ({ SELECT: { from, where } }, scenario) => {
   }
 }
 
-const _calculateDraftAdminColumns = (result, user) => {
-  if (
-    Object.prototype.hasOwnProperty.call(result, 'DraftIsCreatedByMe') &&
-    Object.prototype.hasOwnProperty.call(result, 'CreatedByUser')
-  ) {
+const _calculateDraftAdminColumns = (result, user, deleteLastChangeDateTime) => {
+  if (!result) return
+  if ('InProcessByUser' in result && !draftIsLocked(result.LastChangeDateTime)) result.InProcessByUser = ''
+  if (deleteLastChangeDateTime) delete result.LastChangeDateTime
+  if ('DraftIsCreatedByMe' in result && 'CreatedByUser' in result)
     result.DraftIsCreatedByMe = result.CreatedByUser === user
-  }
-
-  if (
-    Object.prototype.hasOwnProperty.call(result, 'DraftIsProcessedByMe') &&
-    Object.prototype.hasOwnProperty.call(result, 'InProcessByUser')
-  ) {
+  if ('DraftIsProcessedByMe' in result && 'InProcessByUser' in result)
     result.DraftIsProcessedByMe = result.InProcessByUser === user
-  }
 }
 
 const _adaptDraftColumnsForSiblingEntity = (result, isSiblingActive) => {
@@ -1145,30 +1140,6 @@ const _adaptAnnotationAliases = cqn => {
   _collectAliases(cqn.SELECT.from, aliases)
 }
 
-const calculateDraftTimeout = (scenario, result, deleteLastChangeDateTime) => {
-  if (scenario === SCENARIO.DRAFT_ADMIN) {
-    if (!draftIsLocked(result[0].LastChangeDateTime)) {
-      result[0].InProcessByUser = ''
-    }
-    if (deleteLastChangeDateTime) delete result[0].LastChangeDateTime
-
-    return
-  }
-
-  // non empty result that and DraftAdministrativeData was expanded
-  if (result.length && Object.prototype.hasOwnProperty.call(result[0], 'DraftAdministrativeData')) {
-    result.forEach(row => {
-      if (!row.DraftAdministrativeData) return
-      if (Object.prototype.hasOwnProperty.call(row.DraftAdministrativeData, 'InProcessByUser')) {
-        if (!draftIsLocked(row.DraftAdministrativeData.LastChangeDateTime)) {
-          row.DraftAdministrativeData.InProcessByUser = ''
-        }
-      }
-      if (deleteLastChangeDateTime) delete row.DraftAdministrativeData.LastChangeDateTime
-    })
-  }
-}
-
 const enhanceQueryForTimeoutIfNeeded = (scenario, columns = []) => {
   if (scenario !== SCENARIO.DRAFT_ADMIN) {
     const draftAdmin = columns.find(col => col.ref && col.ref[col.ref.length - 1] === 'DraftAdministrativeData')
@@ -1212,6 +1183,51 @@ const _adaptDraftAdminExpand = cqn => {
   }
 }
 
+const _getOriginalColumns = req => {
+  const originalColumns = {}
+  // expanded columns are handled generically in db
+  for (const c of req.query.SELECT.columns) {
+    originalColumns[c.ref ? c.ref[c.ref.length - 1] : c.as || c] = true
+  }
+  return originalColumns
+}
+
+const _postProcess = (result, req, cqnScenario, deleteLastChangeDateTime) => {
+  const resultAsArray = Array.isArray(result) ? result : result ? [result] : []
+
+  if (!result || !resultAsArray.length) return result
+
+  if (cqnScenario.scenario === SCENARIO.SIBLING_ENTITY) {
+    if (resultAsArray[0].draftAdmin_inProcessByUser !== req.user.id) return []
+    delete resultAsArray[0].draftAdmin_inProcessByUser
+    _adaptDraftColumnsForSiblingEntity(resultAsArray[0], cqnScenario.isSiblingActive)
+  }
+
+  const removeDraftUUIDIfNecessaryFn = removeDraftUUIDIfNecessary(req)
+  let notRequestedColumns
+  // REVISIT: remove flag cds.env.features.auto_fetch_expand_keys after two month grace period
+  if (!req.query.SELECT._4odata && !cds.env.features.auto_fetch_expand_keys) {
+    const originalColumns = _getOriginalColumns(req)
+    notRequestedColumns = originalColumns && Object.keys(resultAsArray[0]).filter(key => !originalColumns[key])
+  }
+  if (cqnScenario.scenario === SCENARIO.DRAFT_ADMIN) {
+    _calculateDraftAdminColumns(resultAsArray[0], req.user.id, deleteLastChangeDateTime)
+    if (notRequestedColumns) {
+      for (const key of notRequestedColumns) delete resultAsArray[0][key]
+    }
+  } else {
+    for (const row of resultAsArray) {
+      removeDraftUUIDIfNecessaryFn(row)
+      _calculateDraftAdminColumns(row.DraftAdministrativeData, req.user.id, deleteLastChangeDateTime)
+      if (notRequestedColumns) {
+        for (const key of notRequestedColumns) delete row[key]
+      }
+    }
+  }
+
+  return result
+}
+
 /**
  * Generic Handler for READ requests in the context of draft.
  *
@@ -1274,32 +1290,8 @@ const _handler = async function (req) {
   req.target = this.model.definitions[ensureUnlocalized(req.target.name)]
 
   const result = await cds.tx(req).send({ query: cqnScenario.cqn, target: req.target })
-  const resultAsArray = Array.isArray(result) ? result : result ? [result] : []
-  removeDraftUUIDIfNecessary(resultAsArray, req)
-
-  if (cqnScenario.scenario === SCENARIO.DRAFT_ADMIN) {
-    if (!result || (Array.isArray(result) && !result.length)) return result
 
-    _calculateDraftAdminColumns(resultAsArray[0], req.user.id)
-  }
-
-  calculateDraftTimeout(cqnScenario.scenario, resultAsArray, enhancedWithLastChangeDateTime)
-
-  if (cqnScenario.scenario === SCENARIO.SIBLING_ENTITY) {
-    if (!result || (Array.isArray(result) && !result.length)) return result
-    if (resultAsArray[0].draftAdmin_inProcessByUser !== req.user.id) return []
-
-    delete resultAsArray[0].draftAdmin_inProcessByUser
-    _adaptDraftColumnsForSiblingEntity(resultAsArray[0], cqnScenario.isSiblingActive)
-  }
-
-  if (resultAsArray.length && Object.prototype.hasOwnProperty.call(resultAsArray[0], 'DraftAdministrativeData')) {
-    resultAsArray.forEach(row => {
-      row.DraftAdministrativeData && _calculateDraftAdminColumns(row.DraftAdministrativeData, req.user.id)
-    })
-  }
-
-  return result
+  return _postProcess(result, req, cqnScenario, enhancedWithLastChangeDateTime)
 }
 
 module.exports = cds.service.impl(function () {

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

@@ -3,6 +3,7 @@ const { SELECT } = cds.ql
 const { getEnrichedCQN, hasDraft, ensureDraftsSuffix } = require('../utils/handler')
 const { readAndDeleteKeywords } = require('../utils/where')
 const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
+const { isActiveEntityRequested } = require('../../../_runtime/fiori/utils/where')
 
 const _modifyCQN = (cqnDraft, where, context) => {
   const whereDraft = [...where]
@@ -10,9 +11,8 @@ const _modifyCQN = (cqnDraft, where, context) => {
   cqnDraft.where(whereDraft)
 
   if (result && result.value.val === false) {
-    cqnDraft.SELECT.from.ref[cqnDraft.SELECT.from.ref.length - 1] = ensureDraftsSuffix(
-      cqnDraft.SELECT.from.ref[cqnDraft.SELECT.from.ref.length - 1]
-    )
+    const fromRef = cqnDraft.SELECT.from.ref
+    cqnDraft.SELECT.from.ref[fromRef.length - 1] = ensureDraftsSuffix(fromRef[fromRef.length - 1])
   }
 
   for (let i = 0; i < cqnDraft.SELECT.where.length; i++) {
@@ -33,32 +33,89 @@ const _modifyCQN = (cqnDraft, where, context) => {
   }
 }
 
+const _hasNavToNonDraftEnclosedAssoc = (pathSegments, definitions, excludeAssoc) => {
+  if (pathSegments.length < 2) return false
+  const entity = definitions[pathSegments[0]]
+  const nav = entity.elements[pathSegments[1]]
+
+  if (nav._isAssociationStrict) {
+    if (nav['@odata.draft.enclosed']) return false
+    if (excludeAssoc == null) return true
+    if (!excludeAssoc(nav)) return true
+  }
+
+  // At this point we know that nav is a composition, so we have to recursively
+  // follow the navigation until we reach the end or find an association.
+  pathSegments.shift()
+  pathSegments[0] = nav.target
+  return _hasNavToNonDraftEnclosedAssoc(pathSegments, definitions, excludeAssoc)
+}
+
+const _shouldReadOverDraft = (req, definitions) => {
+  const SELECT = req.query.SELECT
+  const fromRef = SELECT.from.ref
+
+  if (!fromRef) return false
+
+  // read over the draft if the navigation target is non-draft-enabled
+  if (!req.target._isDraftEnabled) return true
+
+  // read over the draft only for navigation scenarios
+  if (fromRef.length === 1) return false
+
+  const firstFromRef = fromRef[0]
+  const rootEntityName = typeof firstFromRef === 'string' ? firstFromRef : firstFromRef.id
+  const rootEntity = definitions[rootEntityName]
+
+  // read over the draft only if the root entity is draft-enabled and
+  // the navigation starts with a draft entity (IsActiveEntity=false)
+  if (!!rootEntity._isDraftEnabled && isActiveEntityRequested(firstFromRef.where)) return false
+
+  // read over the draft if the navigation target is an association and
+  // only if it isn't annotated with @odata.draft.enclosed
+  const pathSegments = fromRef.map(path => (typeof path === 'string' ? path : path.id))
+
+  const excludeAssoc = assoc => {
+    if (assoc.name === 'DraftAdministrativeData' || assoc.name === 'SiblingEntity') return true
+    return false
+  }
+
+  return _hasNavToNonDraftEnclosedAssoc(pathSegments, definitions, excludeAssoc)
+}
+
 /**
  * Generic Handler for READ requests.
  *
- * @param req
+ * @param {import('../../cds-services/adapter/odata-v4/ODataRequest')} req
+ * @param next
  * @returns {Promise<Array>}
  */
-const _handler = async function (req) {
-  if (req.query.SELECT.limit && req.query.SELECT.limit.rows && req.query.SELECT.limit.rows.val === 0) {
-    return Promise.resolve([])
-  }
+const _readOverDraftHandler = async function (req, next) {
+  const definitions = this.model.definitions
+
+  // determine whether the request is handled here (read over draft handler),
+  // or whether it is passed to the next registered handler/route
+  if (!_shouldReadOverDraft(req, definitions)) return next()
+
+  const rows = req.query.SELECT.limit && req.query.SELECT.limit.rows
+  if (rows && rows.val === 0) return Promise.resolve([])
 
   // REVISIT DRAFT HANDLING: cqn2cqn4sql must not be called here
-  const sqlQuery = cqn2cqn4sql(req.query, this.model, { _4fiori: true })
+  const sqlQuery = cqn2cqn4sql(req.query, this.model, { _4db: req.target._isDraftEnabled, _4fiori: true })
+
   if (req.query._streaming) {
     sqlQuery._streaming = true
   }
 
-  const hasDraftEntity = hasDraft(this.model.definitions, sqlQuery)
+  const hasDraftEntity = hasDraft(definitions, sqlQuery)
 
-  if (hasDraftEntity && sqlQuery.SELECT.where && sqlQuery.SELECT.where.length !== 0) {
+  if (hasDraftEntity && sqlQuery.SELECT.where && sqlQuery.SELECT.where.length > 0) {
     let cqnDraft = SELECT.from({
       ref: [...sqlQuery.SELECT.from.ref],
       as: sqlQuery.SELECT.from.as
     })
-    cqnDraft.SELECT.columns = sqlQuery.SELECT.columns
 
+    cqnDraft.SELECT.columns = sqlQuery.SELECT.columns
     _modifyCQN(cqnDraft, sqlQuery.SELECT.where, req)
     cqnDraft = getEnrichedCQN(cqnDraft, sqlQuery.SELECT, [])
     return cds.tx(req).run(cqnDraft)
@@ -67,8 +124,6 @@ const _handler = async function (req) {
   return cds.tx(req).run(sqlQuery)
 }
 
-module.exports = cds.service.impl(function () {
-  for (const entity of Object.values(this.entities).filter(e => !e._isDraftEnabled)) {
-    this.on('READ', entity, _handler)
-  }
+module.exports = cds.service.impl(function readOverDraft() {
+  this.on('READ', '*', _readOverDraftHandler)
 })

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

@@ -4,7 +4,7 @@ const { getColumns } = require('../../cds-services/services/utils/columns')
 const { ensureNoDraftsSuffix, ensureDraftsSuffix, ensureUnlocalized } = require('../../common/utils/draft')
 const getTemplate = require('../../common/utils/template')
 
-const { DRAFT_COLUMNS } = require('../../common/constants/draft')
+const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
 // unofficial config!
 const MAX_RECURSION_DEPTH = (cds.env.features.recursion_depth && Number(cds.env.features.recursion_depth)) || 2
@@ -157,7 +157,7 @@ const getEnrichedCQN = (cqn, select, draftWhere, scenarioAlias, addLimitOrder =
 const _aliasRef = (ref, alias) => {
   const newRef = [...ref]
   // we skip draft columns because they are mostly calculated later on
-  if (alias && !DRAFT_COLUMNS.includes(ref[ref.length - 1])) {
+  if (alias && !(ref[ref.length - 1] in DRAFT_COLUMNS_MAP)) {
     newRef.unshift(alias)
   }
   return newRef
@@ -184,17 +184,10 @@ const setStatusCodeAndHeader = (response, keys, entityName, isActiveEntity) => {
   response.setHeader('location', `../${entityName}(${keysString},IsActiveEntity=${isActiveEntity})`)
 }
 
-const removeDraftUUIDIfNecessary = (result, req) => {
-  if (req._.req && req._.req.headers && req._.req.headers['x-cds-odata-version'] === 'v2') return
-
-  if (Array.isArray(result)) {
-    for (const row of result) {
-      delete row.DraftAdministrativeData_DraftUUID
-    }
-  } else {
-    delete result.DraftAdministrativeData_DraftUUID
-  }
-}
+const removeDraftUUIDIfNecessary = req =>
+  req._.req && req._.req.headers && req._.req.headers['x-cds-odata-version'] === 'v2'
+    ? () => {}
+    : result => delete result.DraftAdministrativeData_DraftUUID
 
 const isDraftActivateAction = req => {
   // REVISIT: get rid of getUrlObject

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

@@ -1,3 +1,5 @@
+const AND_OR = { and: 1, or: 1 }
+
 const _removeMultipleBrackets = (index, whereCondition, isXpr) => {
   if (isXpr) return index
 
@@ -20,19 +22,18 @@ const _removeMultipleBrackets = (index, whereCondition, isXpr) => {
 }
 
 const _calculateSpliceArgs = (index, whereCondition, isXpr = false) => {
-  const AND_OR = ['and', 'or']
   const len = isXpr ? 1 : 3
-  if (AND_OR.includes(whereCondition[index - 1])) {
+  if (whereCondition[index - 1] in AND_OR) {
     return { index: index - 1, count: 1 + len }
   }
-  if (AND_OR.includes(whereCondition[index + len])) {
+  if (whereCondition[index + len] in AND_OR) {
     return { index: index, count: len + 1 }
   }
   if (whereCondition[index - 1] === '(' && whereCondition[index + len] === ')') {
-    if (AND_OR.includes(whereCondition[index - 2])) {
+    if (whereCondition[index - 2] in AND_OR) {
       return { index: index - 2, count: len + 3 }
     }
-    if (AND_OR.includes(whereCondition[index + len + 1])) {
+    if (whereCondition[index + len + 1] in AND_OR) {
       return { index: index - 1, count: len + 3 }
     }
 

package/libx/_runtime/hana/Service.js

@@ -107,17 +107,12 @@ class HanaDatabase extends DatabaseService {
 
   _registerAfterHandlers() {
     // REVISIT: after phase runs in parallel -> side effects possible!
-    const { effective } = cds.env
+    const { effective, features } = cds.env
 
-    if (effective.odata.structs) {
+    if (effective.odata.structs && !features.ucsn_struct_conversion) {
       // REVISIT: only register for entities that contain structured or navigation to it
       this.after(['READ'], '*', this._structured)
     }
-
-    if (effective.odata.version !== 'v2') {
-      // REVISIT: only register for entities that contain arrayed or navigation to it
-      this.after(['READ'], '*', this._arrayed)
-    }
   }
 
   /*
@@ -125,14 +120,13 @@ class HanaDatabase extends DatabaseService {
    */
   // eslint-disable-next-line complexity
   async acquire(arg) {
-    // REVISIT: remove fallback arg.user.tenant with cds^6
+    // REVISIT: remove fallback arg.user.tenant with cds^6 (still needed for cds-mtx)
     const tenant = (typeof arg === 'string' ? arg : arg.tenant || (arg.user && arg.user.tenant)) || 'anonymous'
     const dbc = await pool.acquire(tenant, this)
 
     if (typeof arg !== 'string') {
       _setSessionContext(dbc, 'APPLICATIONUSER', arg.user.id || 'ANONYMOUS')
-      // REVISIT: remove fallback arg.user.locale with cds^6
-      _setSessionContext(dbc, 'LOCALE', arg.locale || (arg.user && arg.user.locale) || 'en')
+      _setSessionContext(dbc, 'LOCALE', arg.locale || 'en')
       // REVISIT: stable access
       const validFrom = (arg.context && arg.context._ && arg.context._['VALID-FROM']) || (arg._ && arg._['VALID-FROM'])
       const validto = (arg.context && arg.context._ && arg.context._['VALID-TO']) || (arg._ && arg._['VALID-TO'])

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 ||
@@ -56,7 +56,7 @@ class CustomSelectBuilder extends SelectBuilder {
             select.orderBy.every(o => {
               const k = o.ref && o.ref.length === 1 && o.ref[0]
               const element = (k && entity.elements[k]) || {}
-              return element.type !== 'cds.String'
+              return element._type !== 'cds.String'
             }))
       } catch (e) {
         if (LOG._warn) {

package/libx/_runtime/hana/driver.js

@@ -50,7 +50,7 @@ function _connectHdb(creds, tenant) {
       if (err) {
         err = _ensureError(err)
         err.message = `Could not establish connection for tenant "${tenant}" due to error: ` + err.message
-        LOG._error && LOG.error(err)
+        LOG.error(err)
 
         // error on .connect shall lead to pool drain
         err._connectError = true
@@ -109,7 +109,7 @@ function _connectHanaClient(creds, tenant) {
       if (err) {
         err = _ensureError(err)
         err.message = `Could not establish connection for tenant "${tenant}" due to error: ` + err.message
-        LOG._error && LOG.error(err)
+        LOG.error(err)
 
         // error on .connect shall lead to pool drain
         err._connectError = true

package/libx/_runtime/hana/execute.js

@@ -4,12 +4,7 @@ const LOG = cds.log('hana|db|sql')
 const { HANA_TYPE_CONVERSION_MAP } = require('./conversion')
 const CustomBuilder = require('./customBuilder')
 const { sqlFactory } = require('../db/sql-builder/')
-const {
-  getPostProcessMapper,
-  getPropertyMapper,
-  getStructMapper,
-  postProcess
-} = require('../db/data-conversion/post-processing')
+const { getPostProcessMapper, postProcess } = require('../db/data-conversion/post-processing')
 const { createJoinCQNFromExpanded, hasExpand, rawToExpanded, expandV2 } = require('../db/expand')
 const {
   hasStreamInsert,
@@ -35,23 +30,11 @@ function _cqnToSQL(model, query, user, locale, txTimestamp) {
 
 const SANITIZE_VALUES = process.env.NODE_ENV === 'production' && cds.env.log.sanitize_values !== false
 
-function _getOutputParameters(stmt) {
-  const result = {}
-  const info = stmt.getParameterInfo()
-  for (let i = 0; i < info.length; i++) {
-    const param = info[i]
-    if (param.direction === 2) {
-      result[param.name] = stmt.getParameterValue(i)
-    }
-  }
-
-  return Object.keys(result).length > 0 ? result : undefined
-}
-
 const BINARY_TYPES = {
   12: 'BINARY',
   13: 'VARBINARY',
-  27: 'BLOB'
+  27: 'BLOB',
+  33: 'BSTRING'
 }
 
 function _getBinaries(stmt) {
@@ -147,47 +130,20 @@ 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)
-        }
+    // 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) {
+    // 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
@@ -195,13 +151,19 @@ function _executeAsPreparedStatement(dbc, sql, values, reject, resolve) {
         return reject(err)
       }
 
-      let result = rows
-      if (dbc.name !== 'hdb') {
-        result = _getOutputParameters(stmt) || rows
+      let result
+      if (isProcedureCall) {
+        result =
+          dbc.name === 'hdb'
+            ? _hdbGetResultForProcedure(rows, args, outParameters)
+            : _hcGetResultForProcedure(stmt, rows, outParameters)
+      } else {
+        result = rows
       }
 
       stmt.drop(() => {})
-      resolve(procedureReturn || result)
+
+      resolve(result)
     })
   })
 }
@@ -235,13 +197,13 @@ function _executeSimpleSQL(dbc, sql, values) {
   })
 }
 
-function _executeSelectSQL(dbc, sql, values, isOne, postMapper, propertyMapper, objStructMapper) {
+function _executeSelectSQL(dbc, sql, values, isOne, postMapper) {
   return _executeSimpleSQL(dbc, sql, values).then(result => {
     if (isOne) {
       result = result.length > 0 ? result[0] : null
     }
 
-    return postProcess(result, postMapper, propertyMapper, objStructMapper)
+    return postProcess(result, postMapper)
   })
 }
 
@@ -272,17 +234,9 @@ function executeSelectCQN(model, dbc, query, user, locale, txTimestamp) {
   }
 
   const { sql, values = [] } = _cqnToSQL(model, query, user, locale, txTimestamp)
-  const propertyMapper = getPropertyMapper(model, query, true)
-
-  return _executeSelectSQL(
-    dbc,
-    sql,
-    values,
-    query.SELECT.one,
-    getPostProcessMapper(HANA_TYPE_CONVERSION_MAP, model, query),
-    propertyMapper,
-    getStructMapper(model, query, propertyMapper)
-  )
+  const postProcessMapper = getPostProcessMapper(HANA_TYPE_CONVERSION_MAP, model, query)
+
+  return _executeSelectSQL(dbc, sql, values, query.SELECT.one, postProcessMapper)
 }
 
 function _getValuesProxy(values) {

package/libx/_runtime/hana/pool.js

@@ -97,7 +97,7 @@ function factory4(creds, tenant) {
 /*
  * default generic-pool config
  */
-const defaultConfig = { min: 0, max: 100, testOnBorrow: true }
+const defaultConfig = { min: 0, max: 100, testOnBorrow: true, fifo: false }
 
 const _getPoolConfig = function () {
   const { pool: poolConfig } = cds.env.requires.db

package/libx/_runtime/hana/streaming.js

@@ -18,7 +18,8 @@ const streamExtension = _loadStreamExtensionIfNeeded()
 
 function hasStreamInsert(insert, model) {
   if (!model) return true
-  const into = model.definitions[ensureNoDraftsSuffix(insert.into)]
+  const name = insert.into.ref ? insert.into.ref[0] : insert.into
+  const into = model.definitions[ensureNoDraftsSuffix(name)]
   if (!into) return false
 
   if (insert.entries && insert.entries.length > 0) {