@sap/cds 6.6.1 → 6.7.0

package/libx/_runtime/common/code-ext/execute.js

@@ -1,11 +1,12 @@
 const cds = require('../../cds')
-const { Worker } = require('worker_threads')
-const path = require('node:path')
+const path = require('path')
+const { AsyncResource } = require('async_hooks')
 const { timeout, resourceLimits } = require('./config')
+const WorkerPool = require('./WorkerPool')
 const workerPath = path.resolve(__dirname, 'worker.js')
+const workerPool = new WorkerPool(workerPath, { resourceLimits })
 const { Errors } = require('../../../../lib/req/response')
 const LOG = cds.log()
-
 const _getReqData = req => {
   return {
     data: req.data,
@@ -30,21 +31,20 @@ module.exports = async function executeCode(code, req) {
       // no default
     }
   }
-  const workerId = cds.utils.uuid()
-  const contextId = cds.utils.uuid()
-  const worker = new Worker(workerPath, {
-    workerData: { id: workerId },
-    resourceLimits
-  })
 
+  const worker = workerPool.adquire()
+  const workerId = worker.id
+  const contextId = cds.utils.uuid()
   const executePromise = new Promise(function executeCodePromiseExecutor(resolve, reject) {
-    worker.on('online', onStarted)
-    worker.on('message', onMessageReceived)
-    worker.on('error', onError)
-    worker.on('exit', onExit)
+    queueMicrotask(AsyncResource.bind(onStarted))
+    const onMessageReceivedProxy = AsyncResource.bind(onMessageReceived)
+    const onErrorProxy = AsyncResource.bind(onError)
+    const onExitProxy = AsyncResource.bind(onExit)
+    worker.on('message', onMessageReceivedProxy)
+    worker.on('error', onErrorProxy)
+    worker.on('exit', onExitProxy)
 
     let onStartTimeoutID
-
     function onStarted() {
       onStartTimeoutID = setTimeout(() => {
         worker.terminate()
@@ -53,8 +53,11 @@ module.exports = async function executeCode(code, req) {
     }
 
     function onMessageReceived(message) {
+      if (message.contextId !== contextId) return
+
       if (LOG._debug)
         LOG.debug(`Post message received on main thread (code-ext/execute.js) from worker thread`, message)
+
       switch (message.kind) {
         case 'run':
           run(message)
@@ -62,7 +65,6 @@ module.exports = async function executeCode(code, req) {
 
         case 'success':
           onSuccess(message)
-          cleanup()
           return
 
         case 'error':
@@ -77,15 +79,19 @@ module.exports = async function executeCode(code, req) {
       for (const m of message.postMessages) await run(m)
       req.data && Object.assign(req.data, message.req.data) // REVISIT: Why Object.assign(...) is a required?
       req.results = message.req.results
+      cleanup()
       resolve(req.results ?? message.result)
     }
 
     function onError(error) {
+      cleanup()
       reject(error)
     }
 
     function onExit(exitCode) {
-      if (exitCode !== 0) reject(new Error(`Worker thread stopped with exit code ${exitCode}`))
+      if (exitCode !== 0) {
+        reject(new Error(`Worker thread stopped with exit code ${exitCode}`))
+      }
     }
 
     async function run(message) {
@@ -95,14 +101,18 @@ module.exports = async function executeCode(code, req) {
         if (message.responseData) worker.postMessage({ id: message.id, kind: 'responseData', result })
       } catch (error) {
         if (LOG._debug) LOG.debug(`Calling ${message.target}.${message.prop}(...) throws an error.`, error)
-        worker.postMessage({ id: message.id, kind: 'cleanup' })
+        if (message.id) worker.postMessage({ id: message.id, kind: 'cleanup' })
+        cleanup()
         reject(error)
       }
     }
 
     function cleanup() {
       clearTimeout(onStartTimeoutID)
-      worker.terminate()
+      worker.removeListener('message', onMessageReceivedProxy)
+      worker.removeListener('error', onErrorProxy)
+      worker.removeListener('exit', onExitProxy)
+      workerPool.release(worker)
     }
   })
 

package/libx/_runtime/common/code-ext/handlers.js

@@ -1,6 +1,6 @@
 const cds = require('../../cds')
+const LOG = cds.log()
 const executeCode = require('./execute')
-
 const CODE_ANNOTATION = '@extension.code'
 
 module.exports = cds.service.impl(function () {
@@ -20,17 +20,18 @@ module.exports = cds.service.impl(function () {
     if (result == null) return // whether result is null or undefined
     const code = await getCodeFromAnnotation(req.target.name, req.event, 'after')
     if (!code) return
-    await executeCode.call(this, code, req)
+    await executeCode.call(this, code, req).catch(error => LOG._debug && LOG.debug(error))
   })
 
   this.before(['CREATE', 'UPDATE', 'DELETE'], async function (req) {
     const code = await getCodeFromAnnotation(req.target.name, req.event, 'before')
     if (!code) return
-    await executeCode.call(this, code, req)
+    await executeCode.call(this, code, req).catch(error => LOG._debug && LOG.debug(error))
   })
 
   this.on('*', async function (req, next) {
     if (this.name.startsWith('cds.xt')) return next()
+
     // REVISIT: req.target -> wait until implementation task finished
     let fqn = req.target?.actions?.[`${req.event}`] // check for bound action/function
     if (!fqn) {
@@ -43,7 +44,7 @@ module.exports = cds.service.impl(function () {
     if (fqn.kind === 'action' || fqn.kind === 'function' || req.constructor.name === 'EventMessage') {
       const code = await getCodeFromAnnotation(req?.target?.name ?? fqn.name, req.event, 'on')
       if (!code) return next()
-      return await executeCode.call(this, code, req)
+      return await executeCode.call(this, code, req).catch(error => LOG._debug && LOG.debug(error))
     }
   })
 })

package/libx/_runtime/common/code-ext/worker.js

@@ -1,18 +1,60 @@
 const cds = require('../../cds')
 const LOG = cds.log()
 const { parentPort, workerData } = require('worker_threads')
-const { WorkerSELECT, WorkerINSERT, WorkerUPSERT, WorkerUPDATE, WorkerDELETE } = require('./workerQuery')
+const SELECT = require('../../../../lib/ql/SELECT')
+const INSERT = require('../../../../lib/ql/INSERT')
+const UPSERT = require('../../../../lib/ql/UPSERT')
+const UPDATE = require('../../../../lib/ql/UPDATE')
+const DELETE = require('../../../../lib/ql/DELETE')
+const queryExecutor = require('./workerQueryExecutor')
 const WorkerReq = require('./WorkerReq')
 const { timeout } = require('./config')
 
-parentPort.once('message', function onWorkerMessageReceived(message) {
+parentPort.on('message', function onWorkerMessageReceived(message) {
   const { contextId, workerId, kind, code, reqData } = message
-  if (LOG._debug) LOG.debug(`Post message received on worker thread (worker.js) from main thread`, message)
   if (kind !== 'start' || workerId !== workerData.id) return
+  if (LOG._debug) LOG.debug(`Post message received on worker thread (worker.js) from main thread`, message)
 
   // eslint-disable-next-line cds/no-missing-dependencies
   const { VM } = require('vm2')
   const workerReq = new WorkerReq(contextId, reqData)
+
+  class WorkerSELECT extends SELECT {
+    then(r, e) {
+      return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
+    }
+  }
+
+  class WorkerINSERT extends INSERT {
+    then(r, e) {
+      return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
+    }
+  }
+
+  class WorkerUPSERT extends UPSERT {
+    then(r, e) {
+      return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
+    }
+  }
+
+  class WorkerUPDATE extends UPDATE {
+    then(r, e) {
+      return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
+    }
+  }
+
+  class WorkerDELETE extends DELETE {
+    then(r, e) {
+      return new Promise(queryExecutor.bind(this, contextId)).then(r, e)
+    }
+  }
+
+  Object.defineProperty(WorkerSELECT.prototype, 'cmd', { value: 'SELECT' })
+  Object.defineProperty(WorkerINSERT.prototype, 'cmd', { value: 'INSERT' })
+  Object.defineProperty(WorkerUPSERT.prototype, 'cmd', { value: 'UPSERT' })
+  Object.defineProperty(WorkerUPDATE.prototype, 'cmd', { value: 'UPDATE' })
+  Object.defineProperty(WorkerDELETE.prototype, 'cmd', { value: 'DELETE' })
+
   const vm = new VM({
     console: 'inherit',
     timeout, // specifies the number of milliseconds to execute code before terminating execution

package/libx/_runtime/common/code-ext/workerQueryExecutor.js

@@ -1,30 +1,31 @@
 const cds = require('../../cds')
 const LOG = cds.log()
 const { parentPort } = require('worker_threads')
-const executorCallbackMap = new Map()
+const executionContextMap = new Map()
 
 parentPort.on('message', function onWorkerMessageReceived(message) {
   const { id, kind, result } = message
+  if (!executionContextMap.has(id)) return
   if (LOG._debug) LOG.debug(`Post message received on worker thread (workerQueryExecutor.js) from main thread`, message)
-  if (!executorCallbackMap.has(id)) return
 
   switch (kind) {
     case 'responseData':
-      executorCallbackMap.get(id)(result)
-      executorCallbackMap.delete(id)
+      executionContextMap.get(id)(result)
+      executionContextMap.delete(id)
       return
 
     case 'cleanup':
-      executorCallbackMap.delete(id)
+      executionContextMap.delete(id)
       return
   }
 })
 
-function queryExecutor(resolve) {
+function queryExecutor(contextId, resolve) {
   const id = cds.utils.uuid()
-  executorCallbackMap.set(id, result => resolve(result))
+  executionContextMap.set(id, result => resolve(result))
   parentPort.postMessage({
     id,
+    contextId,
     kind: 'run',
     target: 'srv',
     prop: 'run',

package/libx/_runtime/common/composition/delete.js

@@ -230,7 +230,7 @@ const getSetNullParentForeignKeyCQNs = async (model, req, dbQuery) => {
   const cqns = []
   const query = dbQuery || req.query
   // REVISIT: req._tx should not be used like that!
-  const origQuery = (req.tx instanceof cds.DatabaseService && req._ && req._.query) || req.query
+  const origQuery = (req.tx.isDatabaseService && req._ && req._.query) || req.query
   if (!dbQuery && origQuery && origQuery.DELETE && origQuery.DELETE.from.ref && origQuery.DELETE.from.ref.length > 1) {
     // delete via 2one navigation => parent is known => no need to SELECT
     const ref = origQuery.DELETE.from.ref

package/libx/_runtime/common/composition/update.js

@@ -9,6 +9,7 @@ const { ensureNoDraftsSuffix } = require('../utils/draft')
 const { deepCopyObject } = require('../utils/copy')
 
 const getError = require('../../common/error')
+const { getEntityNameFromUpdateCQN } = require('../utils/cqn')
 
 const CHUNK_SIZE = cds.env.features.chunk_deep || Number.MAX_VALUE
 
@@ -264,9 +265,7 @@ const _addSubDeepUpdateCQN = async ({ model, compositionTree, data, selectData,
 
 const hasDeepUpdate = (model, cqn) => {
   if (cqn && cqn.UPDATE && cqn.UPDATE.entity && (cqn.UPDATE.data || cqn.UPDATE.with)) {
-    const updateEntity = cqn.UPDATE.entity
-    const entityName =
-      (updateEntity.ref && (updateEntity.ref[0].id || updateEntity.ref[0])) || updateEntity.name || updateEntity
+    const entityName = getEntityNameFromUpdateCQN(cqn)
     const entity = model.definitions[ensureNoDraftsSuffix(entityName)]
 
     if (entity) {
@@ -287,8 +286,7 @@ const getDeepUpdateCQNs = async (model, req, selectData) => {
   if (selectData.length > 1) throw getError('Deep update can only be performed on a single instance')
 
   const cqns = []
-  const from =
-    (query.UPDATE.entity.ref && query.UPDATE.entity.ref[0]) || query.UPDATE.entity.name || query.UPDATE.entity
+  const from = getEntityNameFromUpdateCQN(query)
   const entityName = ensureNoDraftsSuffix(from)
   const draft = entityName !== from
   const data = query.UPDATE.data ? deepCopyObject(query.UPDATE.data) : {}

package/libx/_runtime/common/generic/auth/expand.js

@@ -30,7 +30,7 @@ const _getRestrictedExpand = (columns, target, definitions) => {
         if (ref_) return ref_
       }
       // expand: '**' or '*3' is only possible within custom handler, no check needed
-      if (typeof col.expand === 'string' && /^\*{1}[\d|*]+/.test(col.expand)) {
+      if (typeof col.expand[0] === 'string' && /^\*{1}[\d|*]+/.test(col.expand[0])) {
         continue
       } else {
         const restricted = _getRestrictedExpand(col.expand, _getTarget(col.ref, target, definitions), definitions)

package/libx/_runtime/common/generic/auth/readOnly.js

@@ -1,3 +1,4 @@
+const cds = require('../../../cds')
 const { getAuthRelevantEntity } = require('./utils')
 const { WRITE_EVENTS } = require('./constants')
 
@@ -14,11 +15,11 @@ function handler(req) {
   }
 
   // @read-only
-  const entity = getAuthRelevantEntity(req, this.model, ['@readonly'])
+  let entity = getAuthRelevantEntity(req, this.model, ['@readonly'])
+  if (cds.env.fiori.lean_draft && (req.event === 'NEW' || req.event === 'UPDATE')) entity = entity?.actives
+
   if (!entity || !entity['@readonly']) return
-  if (entity['@readonly'] && req.event in WRITE_EVENTS) {
-    req.reject(405, 'ENTITY_IS_READ_ONLY', [entity.name])
-  }
+  if (entity['@readonly'] && req.event in WRITE_EVENTS) req.reject(405, 'ENTITY_IS_READ_ONLY', [entity.name])
 }
 
 handler._initial = true

package/libx/_runtime/common/generic/auth/restrict.js

@@ -142,13 +142,18 @@ const _getRestrictionForTarget = (resolvedApplicables, target) => {
 }
 
 const _addRestrictionsToRead = async (req, model, resolvedApplicables) => {
-  if (!cds.env.features.lean_draft && req.target._isDraftEnabled) {
+  if (!cds.env.fiori.lean_draft && req.target._isDraftEnabled) {
     req.query._draftRestrictions = resolvedApplicables
     return
   }
 
   if (typeof req.query.SELECT.from === 'object')
-    req.query.SELECT.from.ref = _addWheresToRef(req.query.SELECT.from.ref, model, resolvedApplicables)
+    // in case of $apply take a ref from sub SELECT//
+    req.query.SELECT.from.ref = _addWheresToRef(
+      req.query.SELECT.from.ref || req.query.SELECT.from.SELECT?.from?.ref,
+      model,
+      resolvedApplicables
+    )
 
   const restrictionForTarget = _getRestrictionForTarget(resolvedApplicables, req.target)
   if (!restrictionForTarget) return

package/libx/_runtime/common/generic/crud.js

@@ -54,10 +54,21 @@ exports.impl = cds.service.impl(function () {
 
     if (req.event in { DELETE: 1, UPDATE: 1 } && req.target && req.target._isSingleton) {
       if (req.event === 'DELETE' && !req.target['@odata.singleton.nullable']) req.reject(400, 'SINGLETON_NOT_NULLABLE')
+      const selectSingleton = SELECT.one(req.target)
       const keyColumns = getColumns(req.target, { onlyNames: true, keysOnly: true })
-      const selectSingleton = SELECT.one(req.target).columns(keyColumns)
+
+      // if no keys available, select all columns so we can delete the singleton with same content
+      if (keyColumns.length) selectSingleton.columns(keyColumns)
+
       const singleton = await cds.tx(req).run(selectSingleton)
       if (!singleton) req.reject(404)
+
+      // REVISIT: Workaround for singleton, to get keys into singleton
+      for (const keyName in singleton) {
+        if (!keyColumns.includes(keyName)) continue
+        req.data[keyName] = singleton[keyName]
+      }
+
       req.query.where(singleton)
     }
 

package/libx/_runtime/common/generic/etag.js

@@ -6,8 +6,7 @@ const { isActiveEntityRequested } = require('../../fiori/utils/where')
 const { ensureDraftsSuffix } = require('../../fiori/utils/handler')
 const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { isAsteriskColumn } = require('../../common/utils/rewriteAsterisks')
-const ODataRequest = require('../../cds-services/adapter/odata-v4/ODataRequest')
-const { resolveView, getTransition } = require('../utils/resolveView')
+const { resolveView } = require('../utils/resolveView')
 
 const C_U_ = {
   CREATE: 1,
@@ -61,8 +60,17 @@ const _addEtagColumns = (columns, entity) => {
 const _isConcurrentODataReq = req => {
   const isReadAfterDraftAction =
     req.event === 'READ' && req.target._isDraftEnabled && req.context.event in { draftActivate: 1, EDIT: 1 }
+  // It's allowed to also delete drafts when actives are deleted
+  if (
+    cds.env.fiori?.lean_draft &&
+    req.event === 'READ' &&
+    req.context.event === 'DELETE' &&
+    req.target?.name.endsWith('.drafts') &&
+    !req.context?.target?.name.endsWith('.drafts')
+  )
+    return
   const _req = isReadAfterDraftAction ? req.context : req
-  return _req instanceof ODataRequest && _req.isConcurrentResource
+  return _req._isOData && _req.isConcurrentResource
 }
 
 /**

package/libx/_runtime/common/generic/input.js

@@ -86,7 +86,7 @@ const _preProcessAssertTarget = (assocInfo, assertMap) => {
   if (parentKeys.length === 0) return
 
   foreignKeys.forEach(keyMap => {
-    const clonedAssocInfo = Object.assign({}, assocInfo, { pathSegments: assocInfo.pathSegments.slice(0) })
+    const clonedAssocInfo = Object.assign({}, assocInfo, { pathSegmentsInfo: assocInfo.pathSegmentsInfo.slice(0) })
     const target = {
       key: mapKey,
       entity: assocTarget,
@@ -126,6 +126,8 @@ const _processCategory = (req, category, value, elementInfo, assertMap) => {
       // > preserve computed values if triggered by draftActivate and not managed
       return
     }
+    // Always take over the values from active entities
+    if (cds.env.fiori?.lean_draft && req.context?.event === 'EDIT') return
 
     delete row[key]
     value.val = undefined
@@ -152,7 +154,7 @@ const _getProcessorFn = (req, errors, assertMap) => {
   const event = req.event
 
   return elementInfo => {
-    const { row, key, element, plain, pathSegments } = elementInfo
+    const { row, key, element, plain, pathSegmentsInfo } = elementInfo
     // ugly pointer passing for sonar
     const value = { mandatory: false, val: row && row[key] }
 
@@ -163,7 +165,7 @@ const _getProcessorFn = (req, errors, assertMap) => {
     if (_shouldSuppressErrorPropagation(event, value)) return
 
     // REVISIT: Convert checkInputConstraints to template mechanism
-    checkInputConstraints({ element, value: value.val, errors, pathSegments, event })
+    checkInputConstraints({ element, value: value.val, errors, pathSegmentsInfo, event })
   }
 }
 
@@ -239,7 +241,7 @@ async function commonGenericInput(req) {
   const pathOptions = {
     rowUUIDGenerator: getRowUUIDGeneratorFn(req.event),
     includeKeyValues: true,
-    pathSegments: []
+    pathSegmentsInfo: []
   }
 
   const boundAction = _getBoundAction(req)
@@ -247,7 +249,7 @@ async function commonGenericInput(req) {
   if (boundAction) {
     const pathSegment = _getBoundActionBindingParameter(boundAction)
     const keys = req._ && req._.params && req._.params[0]
-    if (pathSegment) pathOptions.pathSegments.push(pathSegment)
+    if (pathSegment) pathOptions.pathSegmentsInfo.push(pathSegment)
 
     if (keys && 'IsActiveEntity' in keys) {
       pathOptions.draftKeys = { IsActiveEntity: keys.IsActiveEntity }
@@ -364,7 +366,7 @@ commonGenericInput._initial = true
 _actionFunctionHandler._initial = true
 
 module.exports = cds.service.impl(function () {
-  if (cds.env.features.lean_draft) {
+  if (cds.env.fiori.lean_draft) {
     this.before(['CREATE', 'UPDATE'], '*', commonGenericInput)
   } else {
     this.before(['CREATE', 'UPDATE', 'NEW', 'PATCH'], '*', commonGenericInput)

package/libx/_runtime/common/generic/paging.js

@@ -1,5 +1,27 @@
 const cds = require('../../cds')
-const { getPageSize } = require('../utils/page')
+
+module.exports = exports = cds.service.impl(function () {
+  commonGenericPaging._initial = true
+  this.before('READ', '*', commonGenericPaging)
+})
+
+const DEFAULT = cds.env.query?.limit?.default || 1000
+const MAX = cds.env.query?.limit?.max || 1000
+const _cached = Symbol('@cds.query.limit')
+
+const getPageSize = def => {
+  if (_cached in def) return def[_cached]
+  let max = def['@cds.query.limit.max'] ?? def._service?.['@cds.query.limit.max'] ?? MAX
+  let _default =
+    def['@cds.query.limit.default'] ??
+    def['@cds.query.limit'] ??
+    def._service?.['@cds.query.limit.default'] ??
+    def._service?.['@cds.query.limit'] ??
+    DEFAULT
+  if (!max) max = Number.MAX_SAFE_INTEGER
+  if (!_default || _default > max) _default = max
+  return (def[_cached] = { default: _default, max })
+}
 
 const commonGenericPaging = function (req) {
   // only if http request
@@ -21,10 +43,5 @@ const _addPaging = function ({ SELECT }, target) {
   if (SELECT.from.SELECT?.limit) _addPaging(SELECT.from, target)
 }
 
-/**
- * handler registration
- */
-module.exports = cds.service.impl(function () {
-  commonGenericPaging._initial = true
-  this.before('READ', '*', commonGenericPaging)
-})
+exports.getPageSize = getPageSize
+exports.commonGenericPaging = commonGenericPaging

package/libx/_runtime/common/generic/put.js

@@ -24,7 +24,7 @@ const _fillStructure = (row, parts, element, category, args) => {
 }
 
 const _getProcessorFn = req => {
-  const REST = req.constructor.name === 'RestRequest'
+  const REST = req._isRest
 
   return ({ row, key, element, plain }) => {
     if (!row || row[key] !== undefined) return

package/libx/_runtime/common/generic/sorting.js

@@ -81,5 +81,4 @@ module.exports = cds.service.impl(function () {
   this.before('READ', '*', commonGenericSorting)
 })
 
-// REVISIT: remove (currently needed for test)
 module.exports.handler = commonGenericSorting

package/libx/_runtime/common/i18n/messages.properties

@@ -86,6 +86,7 @@ CRUD_VIA_NAVIGATION_NOT_SUPPORTED=CRUD via navigations is not yet supported
 # draft
 DRAFT_ALREADY_EXISTS=A draft for this entity already exists
 DRAFT_LOCKED_BY_ANOTHER_USER=The entity is locked by another user
+DRAFT_MODIFICATION_ONLY_VIA_ROOT=A draft can only be modified via its root entity
 
 # singleton
 SINGLETON_NOT_NULLABLE=The singleton entity is not nullable

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

@@ -17,7 +17,11 @@ const getEntityNameFromDeleteCQN = cqn => {
 }
 
 const getEntityNameFromUpdateCQN = cqn => {
-  return (cqn.UPDATE.entity.ref && cqn.UPDATE.entity.ref[0]) || cqn.UPDATE.entity.name || cqn.UPDATE.entity
+  return (
+    (cqn.UPDATE.entity.ref && cqn.UPDATE.entity.ref[0] && (cqn.UPDATE.entity.ref[0].id || cqn.UPDATE.entity.ref[0])) ||
+    cqn.UPDATE.entity.name ||
+    cqn.UPDATE.entity
+  )
 }
 
 // scope: simple wheres à la "[{ ref: ['foo'] }, '=', { val: 'bar' }, 'and', ... ]"

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

@@ -713,7 +713,7 @@ const _convertToOneEqNullInFilter = (query, target) => {
 }
 // eslint-disable-next-line complexity
 const _convertSelect = (query, model, _options) => {
-  const _4db = _options.service instanceof cds.DatabaseService
+  const _4db = _options.service?.isDatabaseService
   const options = Object.assign({ _4db, isStreaming: query._streaming }, _options)
 
   // ensure query is ql enabled
@@ -796,7 +796,7 @@ const _convertSelect = (query, model, _options) => {
   if (options._4db && !query.SELECT.columns) {
     let target = query._target
     if (target && target._unresolved && typeof target.name === 'string') {
-      target = model.definitions[ensureNoDraftsSuffix(target.name)] || target
+      target = model.definitions[cds.env.fiori.lean_draft ? target.name : ensureNoDraftsSuffix(target.name)] || target
     }
 
     if (target && !Object.prototype.hasOwnProperty.call(target, '_unresolved')) {

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

@@ -5,7 +5,7 @@ const PERSISTENCE_TABLE = '@cds.persistence.table'
 const { rewriteAsterisks } = require('../../common/utils/rewriteAsterisks')
 
 const getError = require('../error')
-const { getEntityNameFromDeleteCQN, getEntityNameFromUpdateCQN } = require('../utils/cqn')
+const { getEntityNameFromDeleteCQN } = require('../utils/cqn')
 
 const _setInverseTransition = (mapping, ref, mapped) => {
   const existing = mapping.get(ref)
@@ -332,7 +332,7 @@ const _newUpdate = (query, transitions, service) => {
     newUpdate.where = _newWhere(
       newUpdate.where,
       targetTransition,
-      getEntityNameFromUpdateCQN(query),
+      cds.infer(query, service.model.definitions).name,
       query.UPDATE.entity.as
     )
   }
@@ -353,7 +353,7 @@ const _newSelect = (query, transitions, service) => {
   if (!newSelect.columns && targetTransition.mapping.size) newSelect.columns = _initialColumns(targetTransition)
   if (newSelect.columns) {
     rewriteAsterisks({ SELECT: query.SELECT }, service.model, {
-      _4db: service instanceof cds.DatabaseService || service.kind === 'better-sqlite',
+      _4db: service.isDatabaseService,
       target: targetTransition.queryTarget
     })
     newSelect.columns = _newColumns(newSelect.columns, targetTransition, service, service.kind !== 'app-service')
@@ -380,12 +380,16 @@ const _newInsert = (query, transitions, service) => {
   const targetTransition = transitions[transitions.length - 1]
   const targetName = targetTransition.target.name
   const newInsert = Object.create(query.INSERT)
-  newInsert.into = newInsert.into.ref
-    ? {
-        ...newInsert.into,
-        ref: _rewriteQueryPath(query.INSERT.into, transitions)
-      }
-    : targetName
+  if (newInsert.into) {
+    const refObject = newInsert.into.ref ? newInsert.into : { ref: [query.INSERT.into] }
+    newInsert.into = {
+      ...refObject,
+      ref: _rewriteQueryPath(refObject, transitions)
+    }
+    if (!query.INSERT.into.ref) newInsert.into = newInsert.into.ref[0] // leave as string
+  } else {
+    newInsert.into = targetName
+  }
   if (newInsert.columns) newInsert.columns = _newInsertColumns(newInsert.columns, targetTransition)
   if (newInsert.entries) newInsert.entries = _newEntries(newInsert.entries, targetTransition, service)
   Object.defineProperty(newInsert, '_transitions', {
@@ -536,7 +540,7 @@ const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) =>
   if (!skipForbiddenViewCheck) _checkForForbiddenViews(target)
   const targetStartsWithSrvName = service.namespace && target.name.startsWith(`${service.namespace}.`)
   const persistenceTable = _isPersistenceTable(target)
-  const isDatabaseService = service instanceof cds.DatabaseService || service.kind === 'better-sqlite'
+  const isDatabaseService = service.isDatabaseService
   columns = _queryColumns(target, columns, persistenceTable, !isDatabaseService && !targetStartsWithSrvName)
   // REVISIT: Change once we expose database service
   if (persistenceTable && isDatabaseService) {

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

@@ -29,7 +29,7 @@ const _expandColumn = (column, target, _4db) => {
 const rewriteExpandAsterisk = (columns, target) => {
   const expandAllColIdx = columns.findIndex(col => {
     if (col.ref || !col.expand) return
-    return !Array.isArray(col.expand) ? col.expand === '*' : col.expand.indexOf('*') > -1
+    return col.expand.includes('*')
   })
   if (expandAllColIdx > -1) {
     const { expand } = columns.splice(expandAllColIdx, 1)[0]
@@ -56,7 +56,6 @@ const _rewriteAsterisk = (columns, target, _4db, isRoot) => {
 }
 
 const _rewriteAsterisks = (cqn, target, _4db, isRoot) => {
-  if (cqn.expand === '*') cqn.expand = ['*']
   const columns = cqn.expand || cqn.columns
   _rewriteAsterisk(columns, target, _4db, isRoot)
   rewriteExpandAsterisk(columns, target)
@@ -119,7 +118,7 @@ const rewriteAsterisks = (query, model, options) => {
         if (!target) return
 
         query.SELECT.columns = getColumns(target, { _4db }).map(col => ({ ref: [col.name] }))
-        if (_4db && target._isDraftEnabled && !cds.env.features.lean_draft)
+        if (_4db && target._isDraftEnabled && !cds.env.fiori.lean_draft)
           query.SELECT.columns.push(..._cqlDraftColumns(target))
       }
     }