@sap/cds 6.7.2 → 6.8.2

package/libx/_runtime/fiori/lean-draft.js

@@ -25,6 +25,30 @@ const DRAFT_ADMIN_ELEMENTS = [
   'DraftIsProcessedByMe'
 ]
 
+const _fillIsActiveEntity = (row, IsActiveEntity, target) => {
+  if (target.drafts) row.IsActiveEntity = IsActiveEntity
+  for (const key in target.associations) {
+    const prop = row[key]
+    if (!prop) continue
+    const el = target.elements[key]
+    const childIsActiveEntity = el._target.isDraft ? IsActiveEntity : true
+    if (Array.isArray(prop)) prop.map(r => _fillIsActiveEntity(r, childIsActiveEntity, el._target))
+    else if (typeof prop === 'object') _fillIsActiveEntity(prop, childIsActiveEntity, el._target)
+  }
+}
+
+// REVISIT: should not be necessary
+const _runWithContext = (srv, req, obj) => {
+  const r = new cds.Request(obj)
+  r.event // invoke getter
+  r._ = Object.assign(r._, req._)
+  if (req.getUriInfo) r.getUriInfo = () => req.getUriInfo()
+  if (req.getUrlObject) r.getUrlObject = () => req.getUrlObject()
+  r._.params = req.params
+  r._.query = req.query
+  return srv.dispatch(r)
+}
+
 /// It's important to wait for the completion of all promises, otherwise a rollback might happen too soon
 const _promiseAll = async array => {
   const results = await Promise.allSettled(array)
@@ -109,16 +133,15 @@ cds.ApplicationService.prototype.handle = async function (req) {
       (query.DELETE && 'DELETE') ||
       req.event
     _req.target = query._target
-    _req._ = Object.assign({}, req._ || {}) // don't share the same `_` object
-    _req._.params = req.params
     _req.params = req.params
+    _req._ = Object.assign({}, req._ || {})
+    _req._.params = req.params
     _req._.query = query
+    const props = ['_isRest', '_isOData', 'isConcurrentResource', 'isConditional', 'validateEtag']
+    props.forEach(p => {
+      if (req[p]) _req.p = req[p]
+    })
     _req._ = req._
-    _req._isRest = req._isRest
-    _req._isOData = req._isOData
-    _req.isConcurrentResource = req.isConcurrentResource
-    _req.isConditional = req.isConditional
-    _req.validateEtag = req.validateEtag
     const cqnData = _req.query.UPDATE?.data || _req.query.INSERT?.entries?.[0]
     if (cqnData) _req.data = cqnData // must point to the same object
     Object.defineProperty(_req, '_messages', {
@@ -162,7 +185,8 @@ cds.ApplicationService.prototype.handle = async function (req) {
       ])
     )
     const inProcessByUser = draft?.DraftAdministrativeData?.InProcessByUser
-    if (inProcessByUser && inProcessByUser !== cds.context.user.id) req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+    if (inProcessByUser && inProcessByUser !== cds.context.user.id)
+      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [inProcessByUser])
     const deletes = [run(DELETE.from({ ref: query.DELETE.from.ref }))]
     if (draft)
       deletes.push(
@@ -203,7 +227,7 @@ cds.ApplicationService.prototype.handle = async function (req) {
     )
     if (!res) req.reject(404)
     if (res.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id)
-      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [res.DraftAdministrativeData?.InProcessByUser])
     const DraftAdministrativeData_DraftUUID = res.DraftAdministrativeData_DraftUUID
     delete res.DraftAdministrativeData_DraftUUID
     delete res.DraftAdministrativeData
@@ -263,7 +287,7 @@ cds.ApplicationService.prototype.handle = async function (req) {
       )
       if (!res) req.reject(404)
       if (res.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id)
-        req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+        req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [res.DraftAdministrativeData?.InProcessByUser])
       await UPDATE('DRAFT.DraftAdministrativeData')
         .data({
           InProcessByUser: req.user.id,
@@ -368,17 +392,17 @@ const Read = {
         drafts = []
       }
     }
-    Read.merge(query._target, actives, drafts, (row, other) =>
-      other
-        ? Object.assign(row, other, { IsActiveEntity: true, HasActiveEntity: false, HasDraftEntity: true })
-        : Object.assign(row, {
-            IsActiveEntity: true,
-            HasActiveEntity: false,
-            HasDraftEntity: false,
-            DraftAdministrativeData: null,
-            DraftAdministrativeData_DraftUUID: null
-          })
-    )
+    Read.merge(query._target, actives, drafts, (row, other) => {
+      if (other) Object.assign(row, other, { HasActiveEntity: false, HasDraftEntity: true })
+      else
+        Object.assign(row, {
+          HasActiveEntity: false,
+          HasDraftEntity: false,
+          DraftAdministrativeData: null,
+          DraftAdministrativeData_DraftUUID: null
+        })
+      _fillIsActiveEntity(row, true, query._target)
+    })
     return _requested(actives, query)
   },
   unchanged: async function (run, query) {
@@ -420,12 +444,12 @@ const Read = {
       cds.context.user.id
     )
     const drafts = await run(draftsQuery)
-    Read.merge(query._target, drafts, [], row =>
+    Read.merge(query._target, drafts, [], row => {
       Object.assign(row, {
-        HasDraftEntity: false,
-        IsActiveEntity: false
+        HasDraftEntity: false
       })
-    )
+      _fillIsActiveEntity(row, false, query._drafts._target)
+    })
     return _requested(drafts, query)
   },
   all: async function (run, query) {
@@ -467,18 +491,17 @@ const Read = {
     const count = isFirstPage ? ownNewDrafts.length + (isCount ? actives[0]?.$count : actives.$count) : actives.$count
     if (isCount) return { $count: count }
 
-    Read.merge(query._target, ownDrafts, [], row =>
+    Read.merge(query._target, ownDrafts, [], row => {
       Object.assign(row, {
-        IsActiveEntity: false,
         HasDraftEntity: false
       })
-    )
+      _fillIsActiveEntity(row, false, query._drafts._target)
+    })
     Read.delete(query._target, actives, ownEditDrafts)
     const otherEditDrafts = await Read.complementaryDrafts(run, query, actives)
     Read.merge(query._target, actives, otherEditDrafts, (row, other) => {
       if (other) {
         Object.assign(row, {
-          IsActiveEntity: true,
           HasDraftEntity: true,
           HasActiveEntity: false,
           DraftAdministrativeData_DraftUUID: other.DraftAdministrativeData_DraftUUID,
@@ -486,13 +509,13 @@ const Read = {
         })
       } else {
         Object.assign(row, {
-          IsActiveEntity: true,
           HasDraftEntity: false,
           HasActiveEntity: false,
           DraftAdministrativeData_DraftUUID: null,
           DraftAdministrativeData: null
         })
       }
+      _fillIsActiveEntity(row, true, query._target)
     })
     const res = isFirstPage ? [...ownNewDrafts, ...ownEditDrafts, ...actives] : actives
     if (query.SELECT.count) res.$count = count
@@ -518,11 +541,11 @@ const Read = {
     const actives = drafts.length
       ? await run(query.where(Read.whereIn(query._target, drafts)))
       : Object.assign([], { $count: 0 })
-    Read.merge(query._target, actives, drafts, (row, other) =>
-      other
-        ? Object.assign(row, other, { IsActiveEntity: true, HasDraftEntity: true, HasActiveEntity: false })
-        : Object.assign({ IsActiveEntity: true, HasDraftEntity: false, HasActiveEntity: false })
-    )
+    Read.merge(query._target, actives, drafts, (row, other) => {
+      if (other) Object.assign(row, other, { HasDraftEntity: true, HasActiveEntity: false })
+      else Object.assign({ HasDraftEntity: false, HasActiveEntity: false })
+      _fillIsActiveEntity(row, true, query._target)
+    })
     return _requested(actives, query)
   },
   unsavedChangesByAnotherUser: async function (run, query) {
@@ -833,17 +856,17 @@ async function onNew(req) {
   let DraftUUID
   if (isRoot) DraftUUID = cds.utils.uuid()
   else {
-    const rootData = await this.run(
-      SELECT.one(req.query.INSERT.into.ref[0].id)
+    const rootData = await _runWithContext(this, req, {
+      query: SELECT.one(req.query.INSERT.into.ref[0].id)
         .columns([
           { ref: ['DraftAdministrativeData_DraftUUID'] },
           { ref: ['DraftAdministrativeData'], expand: [{ ref: ['InProcessByUser'] }] }
         ])
         .where(req.query.INSERT.into.ref[0].where)
-    )
+    })
     if (!rootData) req.reject(404)
     if (rootData.DraftAdministrativeData?.InProcessByUser !== req.user.id)
-      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+      req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [rootData.DraftAdministrativeData.InProcessByUser])
     DraftUUID = rootData.DraftAdministrativeData_DraftUUID
   }
   const timestamp = cds.context.timestamp.toISOString() // REVISIT: toISOString should be done on db layer
@@ -888,7 +911,7 @@ async function onNew(req) {
   delete draftData.IsActiveEntity
   const draftCQN = INSERT.into(req.target).entries(draftData)
 
-  await _promiseAll([cds.run(adminDataCQN), this.run(draftCQN)])
+  await _promiseAll([cds.run(adminDataCQN), _runWithContext(this, req, { query: draftCQN })])
   req._.readAfterWrite = true
   return { ...draftData, IsActiveEntity: false }
 }
@@ -934,12 +957,12 @@ async function onEdit(req) {
   // It's not possible to use `FOR UPDATE` in HANA if the view contains joins/unions. Unfortunately, we can't resolve the table entity
   // because we must trigger the app-service request on the target entity (which could be delegated to a remote service).
   // The best we can do is to catch a potential error
-  await this.run(activeCheck).catch(_ => {})
+  await _runWithContext(this, req, { query: activeCheck }).catch(_ => {})
 
   const [res, draft] = await _promiseAll([
-    this.run(activeCQN),
+    _runWithContext(this, req, { query: activeCQN }),
     // no user check must be done here...
-    this.run(existingDraft)
+    _runWithContext(this, req, { query: existingDraft })
   ])
 
   if (!res) req.reject(404)
@@ -951,7 +974,7 @@ async function onEdit(req) {
     for (const key in req.target.drafts.keys) keys[key] = res[key]
     await _promiseAll([
       DELETE.from('DRAFT.DraftAdministrativeData').where({ DraftUUID }),
-      this.run(DELETE.from(req.target.drafts).where(keys))
+      _runWithContext(this, req, { query: DELETE.from(req.target.drafts).where(keys) })
     ])
   }
 
@@ -972,7 +995,7 @@ async function onEdit(req) {
   res.DraftAdministrativeData_DraftUUID = DraftUUID
   res.HasActiveEntity = true
   delete res.DraftAdministrativeData
-  await this.run(INSERT.into(targetDraft).entries(res))
+  await _runWithContext(this, req, { query: INSERT.into(targetDraft).entries(res) })
 
   // REVISIT: we need to use okra API here because it must be set in the batched request
   // status code must be set in handler to allow overriding for FE V2
@@ -994,18 +1017,28 @@ async function onCancel(req) {
     ])
   // do not add InProcessByUser restriction
   Object.defineProperty(draftDelete, '_draftParams', { value: draftParams, enumerable: false })
-  const draft = await this.run(draftDelete)
+  const draft = await _runWithContext(this, req, { query: draftDelete })
   if (draftParams.IsActiveEntity === false && !draft) req.reject(404)
   if (draft && draft.DraftAdministrativeData?.InProcessByUser !== cds.context.user.id)
-    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
-  const deletes = !draft ? [] : [this.run(DELETE.from({ ref: req.query.DELETE.from.ref }))]
+    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [draft.DraftAdministrativeData?.InProcessByUser])
+  const queries = !draft ? [] : [_runWithContext(this, req, { query: DELETE.from({ ref: req.query.DELETE.from.ref }) })]
   if (draft && req.target['@Common.DraftRoot.ActivationAction'])
     // only for draft root
-    deletes.push(
+    queries.push(
       DELETE.from('DRAFT.DraftAdministrativeData').where({ DraftUUID: draft.DraftAdministrativeData_DraftUUID })
     )
-  if (draftParams.IsActiveEntity) deletes.push(this.run(DELETE.from({ ref: activeRef })))
-  await _promiseAll(deletes)
+  else
+    queries.push(
+      UPDATE('Draft.DraftAdministrativeData')
+        .data({
+          InProcessByUser: cds.context.user.id,
+          LastChangedByUser: cds.context.user.id,
+          LastChangeDateTime: cds.context.timestamp.toISOString()
+        })
+        .where({ DraftUUID: draft.DraftAdministrativeData_DraftUUID })
+    )
+  if (draftParams.IsActiveEntity) queries.push(_runWithContext(this, req, { query: DELETE.from({ ref: activeRef }) }))
+  await _promiseAll(queries)
   return req.data
 }
 
@@ -1025,9 +1058,10 @@ async function onPrepare(req) {
     .columns(keys)
     .where(where)
   Object.defineProperty(draftQuery, '_draftParams', { value: draftParams, enumerable: false })
-  const data = await this.run(draftQuery)
+  const data = await _runWithContext(this, req, { query: draftQuery })
   if (!data) req.reject(404)
-  if (data.DraftAdministrativeData?.InProcessByUser !== req.user.id) req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+  if (data.DraftAdministrativeData?.InProcessByUser !== req.user.id)
+    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [data.DraftAdministrativeData?.InProcessByUser])
   delete data.DraftAdministrativeData
   return { ...data, IsActiveEntity: false }
 }

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

@@ -188,11 +188,6 @@ const removeDraftUUIDIfNecessary = req =>
     ? () => {}
     : result => delete result.DraftAdministrativeData_DraftUUID
 
-const isDraftActivateAction = req => {
-  // REVISIT: get rid of getUrlObject
-  if (req.getUrlObject) return req.getUrlObject().pathname.endsWith('draftActivate')
-}
-
 const addColumnAlias = (columns, alias) => {
   if (!alias) {
     return columns
@@ -258,7 +253,6 @@ module.exports = {
   getUpdateDraftAdminCQN,
   getEnrichedCQN,
   removeDraftUUIDIfNecessary,
-  isDraftActivateAction,
   ensureDraftsSuffix,
   ensureNoDraftsSuffix,
   ensureUnlocalized,

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

@@ -21,7 +21,7 @@ class CustomFunctionBuilder extends FunctionBuilder {
 
   _handleContains(args) {
     // fuzzy search has three arguments, must not be converted to like expressions
-    if (args.length > 2 || this._options.$searchUsingContains) {
+    if (args.length > 2 || this._obj.searchUsingContains) {
       this._outputObj.sql.push('CONTAINS')
       this._addFunctionArgs(args, true)
       return

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

@@ -25,7 +25,8 @@ class CustomReferenceBuilder extends ReferenceBuilder {
         return
       }
 
-      this._outputObj.sql.push(ref.map(el => this._quoteElement(el)).join('.'))
+      const sql = ref.map(el => this._quoteElement(el)).join('.')
+      this._outputObj.sql.push(sql)
     }
   }
 

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

@@ -4,11 +4,6 @@ const LOG = cds.log('hana|db|sql')
 const SelectBuilder = require('../../db/sql-builder').SelectBuilder
 
 class CustomSelectBuilder extends SelectBuilder {
-  constructor(obj, options, csn) {
-    super(obj, options, csn)
-    // $searchUsingContains property is set in the sub SELECT of the query, optimized search case
-    if (this._obj?._$searchUsingContains) this._options.$searchUsingContains = this._obj._$searchUsingContains
-  }
   get FunctionBuilder() {
     const FunctionBuilder = require('./CustomFunctionBuilder')
     Object.defineProperty(this, 'FunctionBuilder', { value: FunctionBuilder })

package/libx/_runtime/hana/execute.js

@@ -58,6 +58,7 @@ function _getProcedureName(sql) {
 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))
@@ -65,6 +66,7 @@ function _hdbGetResultForProcedure(rows, args, outParameters) {
       result[params[i].PARAMETER_NAME] = args[i]
     }
   }
+
   return result
 }
 
@@ -79,6 +81,7 @@ function _hcGetResultForProcedure(stmt, resultSet, outParameters) {
       }
     }
   }
+
   // merge table output params into scalar params
   const params = Array.isArray(outParameters) && outParameters.filter(md => !(md.PARAMETER_NAME in result))
   if (params && params.length) {
@@ -91,6 +94,7 @@ function _hcGetResultForProcedure(stmt, resultSet, outParameters) {
       resultSet.nextResult()
     }
   }
+
   return result
 }
 
@@ -160,7 +164,6 @@ function _executeAsPreparedStatement(dbc, sql, values, reject, resolve) {
       }
 
       stmt.drop(() => {})
-
       resolve(result)
     })
   })
@@ -180,6 +183,7 @@ function _executeSimpleSQL(dbc, sql, values) {
     if (dbc.name !== 'hdb' && typeof values === 'object') {
       values = Object.values(values)
     }
+
     // ensure that stored procedure with parameters is always executed as prepared
     if (_hasValues(values) || !!_getProcedureName(sql)) {
       _executeAsPreparedStatement(dbc, sql, values, reject, resolve)
@@ -230,12 +234,12 @@ function executeSelectCQN(model, dbc, query, user, locale, txTimestamp) {
     ) {
       return expandV2(model, dbc, query, user, locale, txTimestamp, executeSelectCQN)
     }
+
     return _processExpand(model, dbc, query, user, locale, txTimestamp)
   }
 
   const { sql, values = [] } = _cqnToSQL(model, query, user, locale, txTimestamp)
   const postProcessMapper = getPostProcessMapper(HANA_TYPE_CONVERSION_MAP, model, query)
-
   return _executeSelectSQL(dbc, sql, values, query.SELECT.one, postProcessMapper)
 }
 
@@ -245,17 +249,17 @@ function _getValuesProxy(values) {
       if (prop.length > 1 && prop.startsWith(':')) {
         return Object.getOwnPropertyDescriptor(obj, prop.slice(1))
       }
+
       return Object.getOwnPropertyDescriptor(obj, prop)
     },
     get: (obj, prop) => {
       if (prop.length > 1 && prop.startsWith(':')) {
         return obj[prop.slice(1)]
       }
+
       return obj[prop]
     },
-    ownKeys: target => {
-      return Reflect.ownKeys(target).map(key => `:${key}`)
-    }
+    ownKeys: target => Reflect.ownKeys(target).map(key => `:${key}`)
   })
 }
 
@@ -276,6 +280,7 @@ function executeInsertCQN(model, dbc, query, user, locale, txTimestamp) {
     if (dbc.name === 'hdb') {
       return writeStreamWithHdb(dbc, sql, values)
     }
+
     return writeStreamWithHanaClient(dbc, sql, values)
   }
 
@@ -284,6 +289,7 @@ function executeInsertCQN(model, dbc, query, user, locale, txTimestamp) {
     const affectedRowsCount = Array.isArray(affectedRows)
       ? affectedRows.reduce((sum, rows) => sum + rows, 0)
       : affectedRows
+
     if (entriesOrRows && entriesOrRows.length !== affectedRowsCount) {
       LOG._warn &&
         LOG.warn(
@@ -295,13 +301,17 @@ function executeInsertCQN(model, dbc, query, user, locale, txTimestamp) {
             query
           }
         )
+
       throw new Error('Possible data loss by INSERT into HANA db. Please, update a corresponding HANA driver.')
     }
+
     // InsertResult needs an object per row with its values
     // query.INSERT.values -> one row
     if (query.INSERT.values) return [{ affectedRows: 1, values: [values] }]
+
     // query.INSERT.entries or .rows -> multiple rows
     if (entriesOrRows) return values.map(v => ({ affectedRows: 1, values: v }))
+
     // INSERT into SELECT
     return [{ affectedRows }]
   })
@@ -331,20 +341,17 @@ function executeGenericCQN(model, dbc, query, user, locale, txTimestamp) {
 async function executeSelectStreamCQN(model, dbc, query, user, locale, txTimestamp) {
   const { sql, values = [] } = _cqnToSQL(model, query, user, locale, txTimestamp)
   let result
+
   if (dbc.name === 'hdb') {
     result = await readStreamWithHdb(dbc, sql, values)
   } else {
     result = await readStreamWithHanaClient(dbc, sql, values)
   }
 
-  if (result.length === 0) {
-    return
-  }
+  if (result.length === 0) return
 
   const val = Object.values(result[0])[0]
-  if (val === null) {
-    return null
-  }
+  if (val === null) return null
 
   return { value: val }
 }

package/libx/_runtime/hana/pool.js

@@ -17,6 +17,7 @@ function multiTenantServiceManager() {
     if (e.code === 'MODULE_NOT_FOUND') return null
     else throw e
   }
+
   const oldIm =
     cds.requires.multitenancy?.['old-instance-manager'] ??
     cds.env.requires?.['cds.xt.DeploymentService']?.['old-instance-manager']
@@ -93,8 +94,10 @@ async function credentials4(tenant, db) {
   return new Promise((resolve, reject) => {
     db._instance_manager.get(tenant, (err, res) => {
       if (err) return reject(err)
-      if (!res)
+      if (!res) {
         return reject(Object.assign(new Error(`There is no instance for tenant "${tenant}"`), { statusCode: 404 }))
+      }
+
       resolve(res.credentials)
     })
   })
@@ -102,15 +105,9 @@ async function credentials4(tenant, db) {
 
 function factory4(creds, tenant) {
   return {
-    create: function () {
-      return hana.__connect(creds, tenant)
-    },
-    destroy: function (client) {
-      return hana.__disconnect(client)
-    },
-    validate: function (client) {
-      return hana.__isConnected(client)
-    }
+    create: () => hana.__connect(creds, tenant),
+    destroy: client => hana.__disconnect(client),
+    validate: client => hana.__isConnected(client)
   }
 }
 
@@ -121,7 +118,6 @@ const defaultConfig = { min: 0, max: 100, testOnBorrow: true, fifo: false }
 
 const _getPoolConfig = function () {
   const { pool: poolConfig } = cds.env.requires.db
-
   const mergedConfig = Object.assign({}, defaultConfig, poolConfig)
 
   // defaults
@@ -154,15 +150,19 @@ const _getMassagedCreds = function (creds) {
   if (!('ca' in creds) && creds.certificate) {
     creds.ca = creds.certificate
   }
+
   if ('encrypt' in creds && !('useTLS' in creds)) {
     creds.useTLS = creds.encrypt
   }
+
   if ('hostname_in_certificate' in creds && !('sslHostNameInCertificate' in creds)) {
     creds.sslHostNameInCertificate = creds.hostname_in_certificate
   }
+
   if ('validate_certificate' in creds && !('sslValidateCertificate' in creds)) {
     creds.sslValidateCertificate = creds.validate_certificate
   }
+
   return creds
 }
 
@@ -185,9 +185,11 @@ async function pool4(tenant, db) {
             )
 
             /*
-             * The error listener for "factoryCreateError" is registered in order to find out failed connection attempts.
-             * If it fails due to invalid credentials, we delete the current pool from the pools map and overwrite the pool factory create function.
-             * Background is that generic-pool will continue to try to open a connection by calling the factory create function until the "acquireTimeoutMillis" is reached.
+             * The error listener for "factoryCreateError" is registered to find out failed connection attempts.
+             * If it fails due to invalid credentials, we delete the current pool from the pools map and overwrite the
+             * pool factory create function.
+             * Background is that generic-pool will continue to try to open a connection by calling the factory create
+             * function until the "acquireTimeoutMillis" is reached.
              * This ends up in many connection attempts for one request even though the credentials are invalid.
              * Because of the deletion in the map, subsequent requests will fetch the credentials again.
              */
@@ -218,6 +220,7 @@ async function pool4(tenant, db) {
       })
     )
   }
+
   if ('then' in pools.get(tenant)) {
     pools.set(tenant, await pools.get(tenant))
   }
@@ -240,12 +243,17 @@ async function resilientAcquire(pool, attempts = 1) {
       attempt++
     }
   }
+
   if (client) return client
+
   const { borrowed, pending, size, available, max } = pool
+  const message =
+    'Acquiring client from pool timed out. Please review your system setup, transaction handling, and pool configuration. ' +
+    `Pool State: borrowed: ${borrowed}, pending: ${pending}, size: ${size}, available: ${available}, max: ${max}`
   err = getError(
     Object.assign(err, {
       statusCode: 503,
-      message: `Acquiring client from pool timed out. Please review your system setup, transaction handling, and pool configuration. Pool State: borrowed: ${borrowed}, pending: ${pending}, size: ${size}, available: ${available}, max: ${max}`
+      message
     })
   )
   err._attempts = attempt
@@ -262,9 +270,9 @@ module.exports = {
     client._pool = pool
     return client
   },
-  release: client => {
-    return client._pool.release(client)
-  },
+
+  release: client => client._pool.release(client),
+
   drain: async tenant => {
     const pool = pools.get(tenant)
     if (!pool) return

package/libx/_runtime/hana/search2Contains.js

@@ -62,7 +62,7 @@ const search2Contains = (cqnSearchPhrase, columns) => {
 const isContainsPredicateSupported = (query, entity, columns2Search) => {
   const cqnSearchPhrase = query.SELECT.search
 
-  if (cqnSearchPhrase && cqnSearchPhrase[0] && cqnSearchPhrase[0].val === ' ') return false
+  if (cqnSearchPhrase?.[0]?.val === ' ') return false
 
   // REVISIT: In the future, to further optimize search queries, you might
   // want to remove the following condition(s).