@sap/cds 7.9.2 → 8.0.3

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

@@ -68,25 +68,22 @@ const handleAliasInResult = (columns, result) => {
 // REVISIT: todo renaming for expanded entities
 // REVISIT: todo renaming for deep operations
 const postProcess = (query, result, service, onlySelectAliases = false) => {
+  if (!result) return result //> null and other falsy values must be returned
+
+  if (query.DELETE) return result
+
   if (query.SELECT) {
-    if (query.SELECT.columns && query.SELECT.columns.find(col => col.func === 'count' && col.as === '$count')) {
-      return [{ $count: result }]
-    }
-    handleAliasInResult(query.SELECT.columns, result)
+    if (query.SELECT.columns?.find(col => col.func === 'count' && col.as === '$count')) return [{ $count: result }]
 
-    if (!onlySelectAliases) {
-      const transition =
-        query.SELECT && query.SELECT._transitions && query.SELECT._transitions[query.SELECT._transitions.length - 1]
-      if (transition && result) return revertData(result, transition, service)
-    }
+    handleAliasInResult(query.SELECT.columns, result)
 
-    return result
+    if (onlySelectAliases) return result
   }
-  if (query.DELETE) return result
-  let transition
-  if (query.INSERT) transition = query.INSERT._transitions[query.INSERT._transitions.length - 1]
-  if (query.UPDATE) transition = query.UPDATE._transitions[query.UPDATE._transitions.length - 1]
-  return revertData(result, transition, service)
+
+  const transitions = query.SELECT?._transitions || query.INSERT?._transitions || query.UPDATE?._transitions
+  if (transitions) return revertData(result, transitions[transitions.length - 1], service)
+
+  return result
 }
 
 module.exports = postProcess

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

@@ -81,7 +81,6 @@ const _propagateToParent = ({ parentElement, childElement, deep }, childRow, row
   }
 }
 
-/* eslint-disable complexity */
 module.exports = (
   tKey,
   row,

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

@@ -106,7 +106,6 @@ const _newNestedData = (queryTarget, newData, ref, value) => {
   }
 }
 
-// eslint-disable-next-line complexity
 const _newData = (data, transition, inverse, service) => {
   if (data === null) return null
 
@@ -592,7 +591,7 @@ const _checkForForbiddenViews = queryTarget => {
 const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) => {
   // REVISIT: Find less param polluting way to skip forbidden view check for reads
   if (!skipForbiddenViewCheck) _checkForForbiddenViews(target)
-  const targetStartsWithSrvName = service.namespace && target.name.startsWith(`${service.namespace}.`)
+  const targetStartsWithSrvName = service.definition?.name && target.name.startsWith(`${service.definition.name}.`)
   const persistenceTable = _isPersistenceTable(target)
   const isDatabaseService = service.isDatabaseService
   columns = _queryColumns(target, columns, persistenceTable, !isDatabaseService && !targetStartsWithSrvName)
@@ -611,7 +610,7 @@ const _getTransitionData = (target, columns, service, skipForbiddenViewCheck) =>
   if (target.query && target.query._target) {
     const newTarget = target.query._target
 
-    if (isDatabaseService || !(service.namespace && newTarget.name.startsWith(`${service.namespace}.`))) {
+    if (isDatabaseService || !(service.definition?.name && newTarget.name.startsWith(`${service.definition.name}.`))) {
       return _getTransitionData(newTarget, columns, service, skipForbiddenViewCheck)
     }
 

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

@@ -1,27 +1,55 @@
+// CLEANUP: This is only used in our Okra-based stuff now -> should move over there
 const cds = require('../../cds')
 
-// REVISIT: This is a perfect example of the expensive-check-before-doing anti pattern
+const $cache = Symbol('service contains any restrictions cache')
+
 const containsAnyRestrictions = srv => {
-  const accessRestrictions = getAccessRestrictions(srv)
-  if (accessRestrictions.length > 1 || accessRestrictions[0] !== 'any') return true
-
-  const entities = srv.entities
-  const entitiesKeys = Object.keys(entities)
-
-  return !!(
-    entitiesKeys.some(entity => entities[entity]['@requires'] || entities[entity]['@restrict']) ||
-    entitiesKeys.some(entity => {
-      const actions = entities[entity].actions
-      actions && Object.keys(actions).some(action => actions[action]['@requires'] || actions[action]['@restrict'])
-    }) ||
-    Object.keys(srv.operations).some(
-      operation => srv.operations[operation]['@requires'] || srv.operations[operation]['@restrict']
+  let { model } = srv
+  if (srv.isExtensible) model = cds.context?.model || srv.model // REVISIT: extensions are not allowed to add or change restrictions, are they?
+
+  if (!model[$cache]) model[$cache] = new Map() // REVIST: reuse model._cached instead of introducing a separate one
+  const cache = model[$cache]
+
+  if (cache.has(srv.name)) return cache.get(srv.name)
+
+  cache.set(srv.name, false)
+
+  const accessRestrictions = getAccessRestrictions(model.definitions[srv.definition.name])
+  if (accessRestrictions.length > 1 || accessRestrictions[0] !== 'any') {
+    cache.set(srv.name, true)
+  } else {
+    // REVISIT: Use srv.definiton.entities instead
+    const entities = Object.keys(model.definitions).filter(k => {
+      const d = model.definitions[k]
+      return d.kind === 'entity' && d.name.startsWith(srv.definition.name + '.')
+    })
+    // REVISIT: Use srv.definiton.actions instead
+    const operations = Object.keys(model.definitions).filter(k => {
+      const d = model.definitions[k]
+      return (d.kind === 'action' || d.kind === 'function') && d.name.startsWith(srv.definition.name + '.')
+    })
+    // REVISIT: @requires and @restrict on single entities or operations DOES NOT mean that all service is restricted !
+    cache.set(
+      srv.name,
+      !!(
+        entities.some(ek => model.definitions[ek]['@requires'] || model.definitions[ek]['@restrict']) ||
+        entities.some(ek => {
+          const actions = model.definitions[ek].actions
+          actions && Object.keys(actions).some(action => actions[action]['@requires'] || actions[action]['@restrict'])
+        }) ||
+        operations.some(ok => model.definitions[ok]['@requires'] || model.definitions[ok]['@restrict'])
+      )
     )
-  )
+  }
+
+  return cache.get(srv.name)
 }
 
+// REVISIT: this is the legacy variant of HttpAdapter.early_access_check4, isn't it?
 const getAccessRestrictions = srv => {
-  let restrictions = srv.definition['@restrict'] || srv.definition['@requires']
+  const srvDefinition = srv.definition || srv
+
+  let restrictions = srvDefinition['@restrict'] || srvDefinition['@requires']
   if (restrictions) {
     if (typeof restrictions === 'string') return [restrictions]
     return restrictions.map(r => r.to || r).flat()

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

@@ -1,6 +1,6 @@
 const { getNavigationIfStruct } = require('./structured')
 const getColumns = require('../../db/utils/columns')
-const { ensureNoDraftsSuffix, getDraftColumnsCQNForActive } = require('./draft')
+const { ensureNoDraftsSuffix } = require('./draft')
 const { getEntityNameFromCQN } = require('./entityFromCqn')
 const cds = require('../../cds')
 
@@ -14,11 +14,6 @@ const isDuplicate = newColumn => column => {
   return newColumn.ref ? newColumn.ref.join('_') === column.ref.join('_') : newColumn === column.ref.join('_')
 }
 
-const _cqlDraftColumns = target => {
-  if (target.name.endsWith('DraftAdministrativeData')) return []
-  return getDraftColumnsCQNForActive(target)
-}
-
 const _expandColumn = (column, target, _4db) => {
   if (!(column.ref && column.expand)) return
   const nextTarget = getNavigationIfStruct(target, column.ref)
@@ -146,8 +141,6 @@ const rewriteAsterisks = (query, model, options) => {
         query.SELECT.columns = getColumns(target, { _4db, omitStream: !cds.env.features.stream_compat }).map(col => ({
           ref: [col.name]
         }))
-        if (_4db && target._isDraftEnabled && !cds.env.fiori.lean_draft)
-          query.SELECT.columns.push(..._cqlDraftColumns(target))
       }
     }
 

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

@@ -1,14 +1,10 @@
 const cds = require('../../cds')
 const LOG = cds.log('odata')
 const { SELECT } = cds.ql
-const { deepCopyArray } = require('./copy')
+const { deepCopy } = require('./copy')
 const { getTransition } = require('./resolveView')
-const { cqn2cqn4sql } = require('./cqn2cqn4sql')
-const { adaptStreamCQN } = require('../../fiori/utils/stream.js')
-const { isPathToDraft } = require('./cqn')
 
-// eslint-disable-next-line complexity
-const _getStreamProperties = (req, query, model) => {
+const _getStreamProperties = (req, query) => {
   // new odata parser sets streaming property in SELECT.from
   const ref = (query.SELECT.columns && query.SELECT.columns[0].ref) || query.SELECT.from.ref
   const propertyName = ref[ref.length - 1]
@@ -74,17 +70,8 @@ const _getStreamProperties = (req, query, model) => {
 
   if (columns.length && cds.db && !req.target._hasPersistenceSkip) {
     // used cloned path
-    let select = SELECT.one
-      .from({ ref: deepCopyArray(query.SELECT.from.ref), as: query.SELECT.from.as })
-      .columns(columns)
+    let select = SELECT.one.from({ ref: deepCopy(query.SELECT.from.ref), as: query.SELECT.from.as }).columns(columns)
     if (query.SELECT.where?.length) select.SELECT.where = query.SELECT.where
-    if (!cds.env.fiori.lean_draft) {
-      const draft = req.target._isDraftEnabled && isPathToDraft(select.SELECT.from.ref, model)
-      if (draft) {
-        select = cqn2cqn4sql(select, model)
-        adaptStreamCQN(select, draft)
-      }
-    }
 
     return cds
       .tx(req)

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

@@ -1,23 +1,16 @@
 const cds = require('../../cds')
-const { ensureNoDraftsSuffix, ensureUnlocalized } = require('../../fiori/utils/handler')
+const { ensureNoDraftsSuffix, ensureUnlocalized } = require('./draft')
 const { isDuplicate } = require('./rewriteAsterisks')
 
 const _addColumn = (name, type, columns, url) => {
-  // we do not want to return these additional odata properties with new adapter
-  if (cds.env.features.odata_new_adapter) return
-
-  if (typeof type === 'object') {
-    let mType = type['='].replaceAll(/\./g, '_')
-    const ref = {
-      ref: [mType],
-      as: `${name}@odata.mediaContentType`
-    }
-    if (!columns.find(isDuplicate(ref))) columns.push(ref)
-  } else {
-    const val = { val: type, as: `${name}@odata.mediaContentType` }
-    if (!columns.find(isDuplicate(val))) columns.push(val)
+  const mediaType = typeof type === 'object' ? { ref: [type['='].replaceAll(/\./g, '_')] } : { val: type }
+  const col = {
+    xpr: ['case', 'when', { ref: [name] }, '=', { val: null }, 'then', 'NULL', 'else', mediaType, 'end'],
+    as: `${name}@odata.mediaContentType`
   }
 
+  if (!columns.find(isDuplicate(col))) columns.push(col)
+
   if (url) {
     const ref = {
       ref: [name],
@@ -28,17 +21,14 @@ const _addColumn = (name, type, columns, url) => {
 }
 
 const _addColumns = (target, columns) => {
-  if (cds.env.features.odata_new_adapter) return
-
   for (const k in target.elements) {
     const el = target.elements[k]
     if (el['@Core.MediaType']) {
-      _addColumn(el.name, el['@Core.MediaType'], columns, el['@Core.IsURL'])
+      _addColumn(el.name, el['@Core.MediaType'], columns, el['@Core.IsURL'] && el.type === 'cds.String')
     }
   }
 }
 
-// eslint-disable-next-line complexity
 const handleStreamProperties = (target, columns, model) => {
   if (!target || !model || !columns) return
 

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

@@ -160,7 +160,7 @@ const _transformStructToFlatWhereHaving = ([first, op, second], resArray, struct
   let structData = val
   try {
     structData = JSON.parse(val)
-  } catch (e) {
+  } catch {
     /* since val === string */
   }
   if (flattenedElement && (structData === val || `${structData}` === val)) {

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

@@ -62,8 +62,6 @@ const _processor = ({ row, key, plain: { category }, element }) => {
   }
 }
 
-// REVISIT: check function complexity
-// eslint-disable-next-line complexity
 const _cleanup = (row, definition, cleanupNull, cleanupStruct, errors, prefix = []) => {
   if (!row || !definition) return
   const elements = definition.elements || definition.params

package/libx/_runtime/db/Service.js

@@ -1,6 +1,4 @@
 const cds = require('../cds')
-const { SELECT } = cds.ql
-const { Transform } = require('stream')
 
 /*
  * generic queries
@@ -12,10 +10,6 @@ const queries = require('./query')
  */
 const generic = require('./generic')
 
-// not able to pass in stream method into cds.utils.deprecated for unknown reason
-// workaround: extract and deprecate helper function
-const _streamDeprecation = () => {}
-
 class DatabaseService extends cds.Service {
   constructor(...args) {
     super(...args)
@@ -93,72 +87,6 @@ class DatabaseService extends cds.Service {
       }
     })
   }
-
-  stream(query) {
-    cds.utils.deprecated(_streamDeprecation, { old: 'cds.stream' })()
-    // aynchronous API: cds.stream(query)
-    if (typeof query === 'object') {
-      // eslint-disable-next-line no-async-promise-executor
-      return new Promise(async (resolve, reject) => {
-        try {
-          if (cds.env.features.stream_compat) {
-            const res = await this.run(Object.assign(query, { _streaming: true }))
-            resolve(res && res.value)
-          } else {
-            const res = await this.run(query)
-            // rely on query returning correct column (as documented for srv.stream(query))
-            if (Array.isArray(res)) {
-              resolve(res.length ? Object.values(res[0])[0] : undefined)
-            } else {
-              resolve(res && Object.values(res)[0])
-            }
-          }
-        } catch (e) {
-          reject(e)
-        }
-      })
-    }
-
-    // synchronous API: cds.stream('column').from(entity).where(...)
-    return {
-      from: (...args) => {
-        const streamQuery = SELECT.one.from(...args)
-        if (query && (!streamQuery.SELECT.columns || streamQuery.SELECT.columns.length !== 0)) {
-          streamQuery.columns([query])
-        }
-
-        if (cds.env.features.stream_compat) streamQuery._streaming = true
-
-        const result = new Transform({
-          transform(chunk, encoding, callback) {
-            this.push(chunk)
-            callback()
-          }
-        })
-
-        if (
-          !streamQuery.SELECT.where &&
-          !(
-            streamQuery.SELECT.from &&
-            streamQuery.SELECT.from.ref &&
-            streamQuery.SELECT.from.ref[streamQuery.SELECT.from.ref.length - 1].where
-          )
-        ) {
-          return {
-            where: (...args) => {
-              streamQuery.where(...args)
-              this._runStream(streamQuery, result)
-              return result
-            }
-          }
-        }
-
-        this._runStream(streamQuery, result)
-
-        return result
-      }
-    }
-  }
 }
 
 DatabaseService.prototype.isDatabaseService = true

package/libx/_runtime/db/data-conversion/post-processing.js

@@ -53,7 +53,6 @@ const _addConverter = (mapper, name, converter) => {
  * @returns {Map<any, any>}
  * @private
  */
-// eslint-disable-next-line complexity
 const _getMapperForListedElements = (conversionMap, csn, cqn) => {
   const mapper = new Map()
 

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -1,8 +1,10 @@
 const cds = require('../../cds')
 
+const { Object_keys } = cds.utils
+
 const { getAllKeys } = require('../../cds-services/adapter/odata-v4/odata-to-cqn/utils')
 
-const { deepCopyObject } = require('../../common/utils/copy')
+const { deepCopy } = require('../../common/utils/copy')
 const { getNavigationIfStruct } = require('../../common/utils/structured')
 const { ensureNoDraftsSuffix, ensureDraftsSuffix, ensureUnlocalized } = require('../../common/utils/draft')
 const { isAsteriskColumn } = require('../../common/utils/rewriteAsterisks')
@@ -10,8 +12,6 @@ const { getCQNUnionFrom } = require('../../common/utils/union')
 
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 
-const { entity_keys } = require('../../fiori/utils/handler')
-
 const getError = require('../../common/error')
 
 // Symbols are used to add extra information in response structure
@@ -26,7 +26,7 @@ const CLEANUP_KEYS = Symbol.for('sap.cds.cleanupKeys')
 
 function getCqnCopy(readToOneCQN) {
   // REVISIT: Use query.clone() instead
-  const readToOneCQNCopy = deepCopyObject(readToOneCQN)
+  const readToOneCQNCopy = deepCopy(readToOneCQN)
   if (readToOneCQN[GET_KEY_VALUE] !== undefined) readToOneCQNCopy[GET_KEY_VALUE] = readToOneCQN[GET_KEY_VALUE]
   if (readToOneCQN[TO_MANY] !== undefined) readToOneCQNCopy[TO_MANY] = readToOneCQN[TO_MANY]
   if (readToOneCQN[TO_ACTIVE] !== undefined) readToOneCQNCopy[TO_ACTIVE] = readToOneCQN[TO_ACTIVE]
@@ -38,6 +38,9 @@ function getCqnCopy(readToOneCQN) {
   return readToOneCQNCopy
 }
 
+const entity_keys = entity =>
+  Object_keys(entity.keys).filter(key => key !== 'IsActiveEntity' && !entity.keys[key].isAssociation)
+
 class JoinCQNFromExpanded {
   constructor(cqn, csn, locale) {
     this._SELECT = {}
@@ -493,7 +496,6 @@ class JoinCQNFromExpanded {
    * @param {boolean} arg.defaultLanguage - Use default language for localized fields
    * @private
    */
-  // eslint-disable-next-line complexity
   _expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage }) {
     const toManyColumns = []
     const mappings = this._getMappingObject(toManyTree)
@@ -654,7 +656,6 @@ class JoinCQNFromExpanded {
    * @param args.defaultLanguage
    * @private
    */
-  // eslint-disable-next-line complexity
   _addJoinAndElements({ column, entity, readToOneCQN, toManyTree, parentAlias, defaultLanguage }) {
     const extendedToManyTree = toManyTree.concat(column.ref[0] === parentAlias ? column.ref.slice(1) : column.ref)
     const tableAlias = this._createAlias(extendedToManyTree.join(':'))
@@ -702,7 +703,7 @@ class JoinCQNFromExpanded {
       const ks = Object.keys(expandedEntity.keys).filter(
         c => !expandedEntity.keys[c].isAssociation && !(c in DRAFT_COLUMNS_MAP)
       )
-      const user = (cds.context && cds.context.user && cds.context.user.id) || 'anonymous'
+      const user = cds.context?.user.id
 
       const assoc = entity.associations[column.ref[0]]
       if (assoc.is2one && assoc.on) {
@@ -1157,7 +1158,6 @@ class JoinCQNFromExpanded {
    * @returns {object}
    * @private
    */
-  // eslint-disable-next-line complexity
   _buildExpandedCQN({ column, entity, readToOneCQN, toManyTree, mappings, parentAlias, defaultLanguage }) {
     const isUnion = !!readToOneCQN.from.SET
     const colRef = parentAlias === column.ref[0] ? column.ref.slice(1) : column.ref.slice(0)
@@ -1233,7 +1233,7 @@ class JoinCQNFromExpanded {
         const ks = Object.keys(expandedEntity.keys).filter(
           c => !expandedEntity.keys[c].isAssociation && !(c in DRAFT_COLUMNS_MAP)
         )
-        const user = (cds.context && cds.context.user && cds.context.user.id) || 'anonymous'
+        const user = cds.context?.user.id
         const unionFrom = getCQNUnionFrom(cols, ref.replace(/_drafts$/, ''), ref, ks, user)
 
         for (const each of cqn.columns) {

package/libx/_runtime/db/expand/rawToExpanded.js

@@ -1,6 +1,5 @@
 const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 const DRAFT_COLUMNS_ARRAY = Object.keys(DRAFT_COLUMNS_MAP)
-const cds = require('../../cds')
 
 const EXPAND = Symbol.for('sap.cds.expand')
 const GET_KEY_VALUE = Symbol.for('sap.cds.getKeyValue')
@@ -85,7 +84,6 @@ class RawToExpanded {
    * @returns {object}
    * @private
    */
-  // eslint-disable-next-line complexity
   _parseRaw({ mappings, toManyTree, conversionMapper, entry }) {
     let isEntityNull
 
@@ -110,12 +108,6 @@ class RawToExpanded {
       if (mapping[TO_MANY]) {
         let expandedItems = this._getResultCache(toManyTree.concat(key))[mapping[GET_KEY_VALUE](false, entry)] || []
 
-        // the expanded items may include the actives of the deleted drafts -> filter out
-        if (!cds.env.fiori.lean_draft && rootIsActiveEntity !== null) {
-          if (mapping[TO_ACTIVE]) expandedItems = expandedItems.filter(ele => ele.IsActiveEntity !== false)
-          else expandedItems = expandedItems.filter(ele => !!ele.IsActiveEntity === rootIsActiveEntity)
-        }
-
         row[key] = !mapping[CLEANUP_KEYS]
           ? expandedItems
           : expandedItems.map(item => {

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

@@ -87,8 +87,8 @@ const _processCategory = (req, category, { row, key, element }) => {
         req.error({
           code: 'MUST_NOT_BE_NULL',
           message: 'Value is required',
-          target: key + '[' + k + ']',
-          args: [key + '[' + k + ']']
+          target: key + '[' + k.name + ']',
+          args: [key + '[' + k.name + ']']
         })
         return
       }
@@ -102,12 +102,7 @@ const _processCategory = (req, category, { row, key, element }) => {
   }
 
   // generate UUIDs
-  if (
-    category === 'uuid' &&
-    !val &&
-    req.event === 'CREATE' &&
-    !element.parent.elements[element._foreignKey4]?._isAssociationStrict
-  ) {
+  if (category === 'uuid' && !val && req.event === 'CREATE' && !element._foreignKey4) {
     row[key] = cds.utils.uuid()
   }
 }

package/libx/_runtime/db/generic/rewrite.js

@@ -2,13 +2,33 @@ const cds = require('../../cds')
 const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { generateAliases } = require('../utils/generateAliases')
 
+/**
+ * Restores the link of `req.data` and `req.query` in case `req.query` was overwritten.
+ * Only applicable for `UPDATE`s and `INSERT`s.
+ *
+ * @param { import('@sap/cds').Request } req
+ */
 const _restoreLink = req => {
   if (req.query.INSERT?.entries) {
-    return (req.data = Array.isArray(req.query.INSERT.entries) ? req.query.INSERT.entries[0] : req.query.INSERT.entries)
+    if (Array.isArray(req.query.INSERT.entries)) req.data = req.query.INSERT.entries[0]
+    else req.data = req.query.INSERT.entries
+  } else if (req.query.UPDATE?.data) {
+    req.data = req.query.UPDATE.data
   }
+}
+
+const _isLinked = req => {
+  if (req.query.INSERT?.entries) {
+    // in case of more than one entry, the array reference stays in tact
+    if (Array.isArray(req.query.INSERT.entries)) return req.data === req.query.INSERT.entries[0]
+    return req.data === req.query.INSERT.entries
+  }
+
   if (req.query.UPDATE?.data) {
-    return (req.data = req.query.UPDATE.data)
+    return req.data === req.query.UPDATE.data
   }
+
+  return false
 }
 
 function handler(req) {
@@ -30,14 +50,17 @@ function handler(req) {
 
   const _streaming = cds.env.features.stream_compat && req.query._streaming
 
+  // for restore link to req.data
+  const linked = _isLinked(req)
+
   // convert to sql cqn
   req.query = cqn2cqn4sql(req.query, this.model, { service: this })
 
+  // REVISIT: should not be necessary
   // restore link to req.data
-  _restoreLink(req)
+  if (linked) _restoreLink(req)
 
   if (_streaming) req.query._streaming = _streaming
-
   generateAliases(req.query)
 }
 

package/libx/_runtime/db/query/read.js

@@ -1,6 +1,6 @@
 const cds = require('../../cds')
 const normalizeTimestamp = require('../../common/utils/normalizeTimestamp')
-const { deepCopyObject } = require('../../common/utils/copy')
+const { deepCopy } = require('../../common/utils/copy')
 const getError = require('../../common/error')
 
 function _arrayWithCount(a, count) {
@@ -14,7 +14,7 @@ function _arrayWithCount(a, count) {
 
 function _createCountQuery(query) {
   // REVISIT: Use query.clone() instead
-  let _query = { SELECT: deepCopyObject(query.SELECT) }
+  let _query = { SELECT: deepCopy(query.SELECT) }
   delete _query.SELECT.orderBy // not necessary to keep that
   delete _query.SELECT.limit
   // Also change columns in sub queries

package/libx/_runtime/db/sql-builder/ExpressionBuilder.js

@@ -139,7 +139,6 @@ class ExpressionBuilder extends BaseBuilder {
    * @returns {number}
    * @private
    */
-  // eslint-disable-next-line complexity
   _reseverdKeyWords(objects, i) {
     const NOT_EQUAL = { '!=': 1, '<>': 1 }
     if (objects[i] === 'not' && objects[i + 1].func) {

package/libx/_runtime/db/sql-builder/InsertBuilder.js

@@ -161,7 +161,7 @@ class InsertBuilder extends BaseBuilder {
     const uuidKeys = []
     if (this._csn && this._csn.definitions[entityName] && this._csn.definitions[entityName].keys) {
       for (const key of Object.values(this._csn.definitions[entityName].keys)) {
-        if (key.isUUID) {
+        if (key.isUUID && !key._foreignKey4) {
           uuidKeys.push(key.name)
         }
       }

package/libx/_runtime/db/utils/columns.js

@@ -1,10 +1,8 @@
 const cds = require('../../cds')
 const resolveStructured = require('../../common/utils/resolveStructured')
 
-const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
-
 const _isStreamProperty = element => {
-  return element.type === 'cds.LargeBinary' || element['@Core.IsURL']
+  return element.type === 'cds.LargeBinary' || (element['@Core.MediaType'] && element['@Core.IsURL'])
 }
 
 /**
@@ -15,13 +13,12 @@ const _isStreamProperty = element => {
  * @param entity - the csn entity
  * @returns {Array} - array of columns
  */
-const getColumns = (entity, { _4db, onlyKeys, omitStream } = { _4db: true, onlyKeys: false, omitStream: false }) => {
+const getColumns = (entity, { onlyKeys, omitStream } = { onlyKeys: false, omitStream: false }) => {
   // REVISIT is this correct or just a problem that occurs because of new structure we do not deal with yet?
   if (!(entity && entity.elements)) return []
   const columnNames = []
   // REVISIT!!!
   const { structs = cds.env.features.ucsn_struct_conversion } = cds.env.effective.odata
-  const { lean_draft } = cds.env.fiori
   const elements = entity.elements
   for (const elementName in elements) {
     const element = elements[elementName]
@@ -29,7 +26,6 @@ const getColumns = (entity, { _4db, onlyKeys, omitStream } = { _4db: true, onlyK
     if (onlyKeys && !element.key) continue
     if (omitStream && _isStreamProperty(element)) continue
     if (element.isAssociation) continue
-    if (!lean_draft && _4db && entity._isDraftEnabled && elementName in DRAFT_COLUMNS_MAP) continue
     if (structs && element.elements) {
       columnNames.push(...resolveStructured({ element, structProperties: [] }, false))
       continue