@sap/cds 5.5.5 → 5.6.3

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

@@ -1,25 +1,37 @@
 const cds = require('../../cds')
 
 const { getAllKeys } = require('../../cds-services/adapter/odata-v4/odata-to-cqn/utils')
-const { getOnCond } = require('../../common/utils/generateOnCond')
 
 const { getNavigationIfStruct } = require('../../common/utils/structured')
 const { ensureNoDraftsSuffix, ensureDraftsSuffix, ensureUnlocalized } = require('../../common/utils/draft')
 const { filterKeys } = require('../../fiori/utils/handler')
+const { isAsteriskColumn } = require('../../common/utils/rewriteAsterisks')
 
 // Symbols are used to add extra information in response structure
 const GET_KEY_VALUE = Symbol.for('sap.cds.getKeyValue')
 const TO_MANY = Symbol.for('sap.cds.toMany')
 const TO_ACTIVE = Symbol.for('sap.cds.toActive')
-
 const SKIP_MAPPING = Symbol.for('sap.cds.skipMapping')
 const IDENTIFIER = Symbol.for('sap.cds.identifier')
 const IS_ACTIVE = Symbol.for('sap.cds.isActive')
 const IS_UNION_DRAFT = Symbol.for('sap.cds.isUnionDraft')
+
 const { DRAFT_COLUMNS } = require('../../common/constants/draft')
 
 const { getCQNUnionFrom } = require('../../common/utils/union')
 
+function getCqnCopy(readToOneCQN) {
+  const readToOneCQNCopy = JSON.parse(JSON.stringify(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]
+  if (readToOneCQN[SKIP_MAPPING] !== undefined) readToOneCQNCopy[SKIP_MAPPING] = readToOneCQN[SKIP_MAPPING]
+  if (readToOneCQN[IDENTIFIER] !== undefined) readToOneCQNCopy[IDENTIFIER] = readToOneCQN[IDENTIFIER]
+  if (readToOneCQN[IS_ACTIVE] !== undefined) readToOneCQNCopy[IS_ACTIVE] = readToOneCQN[IS_ACTIVE]
+  if (readToOneCQN[IS_UNION_DRAFT] !== undefined) readToOneCQNCopy[IS_UNION_DRAFT] = readToOneCQN[IS_UNION_DRAFT]
+  return readToOneCQNCopy
+}
+
 class JoinCQNFromExpanded {
   constructor(cqn, csn, locale) {
     this._SELECT = Object.assign({}, cqn.SELECT)
@@ -91,16 +103,16 @@ class JoinCQNFromExpanded {
    * @private
    */
   _createJoinCQNFromExpanded(SELECT, toManyTree, defaultLanguage) {
-    const unionArgs = SELECT.from.args
-    const isJoinOfTwoUnions = unionArgs && unionArgs.every(a => a.SELECT)
+    const joinArgs = SELECT.from.args
+    const isJoinOfTwoSelects = joinArgs && joinArgs.every(a => a.SELECT)
 
     const unionTableRef = this._getUnionTable(SELECT)
     const unionTable = unionTableRef && unionTableRef.table
     const tableAlias = this._getTableAlias(SELECT, toManyTree, unionTable)
 
-    const readToOneCQN = this._getReadToOneCQN(SELECT, isJoinOfTwoUnions ? 'filterExpand' : tableAlias)
+    const readToOneCQN = this._getReadToOneCQN(SELECT, isJoinOfTwoSelects ? 'filterExpand' : tableAlias)
 
-    if (isJoinOfTwoUnions) {
+    if (isJoinOfTwoSelects) {
       // mappings
       const mappings = this._getMappingObject(toManyTree)
       const prefix = `${tableAlias}_`
@@ -110,7 +122,7 @@ class JoinCQNFromExpanded {
           mappings[c.as.replace(prefix, '')] = c.as
         })
       // expand to one
-      const entity = this._csn.definitions[unionArgs[0].SELECT.from.SET.args[1].SELECT.from.ref[0]]
+      const entity = this._csn.definitions[joinArgs[0].SELECT.from.SET.args[1].SELECT.from.ref[0]]
       const givenColumns = readToOneCQN.columns
       readToOneCQN.columns = []
       this._expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage })
@@ -128,6 +140,9 @@ class JoinCQNFromExpanded {
       this._expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage })
     }
 
+    // brute force hack
+    readToOneCQN.columns = readToOneCQN.columns.filter(c => c.as !== 'filterExpand_IsActiveEntity')
+
     // Add at start, so that the deepest level is post processed first
     this.queries.push({
       SELECT: readToOneCQN,
@@ -480,6 +495,8 @@ class JoinCQNFromExpanded {
     const toManyColumns = []
     const mappings = this._getMappingObject(toManyTree)
 
+    const readToOneCQNCopy = getCqnCopy(readToOneCQN)
+
     for (const column of givenColumns) {
       let navigation
       if (column.expand) {
@@ -523,7 +540,16 @@ class JoinCQNFromExpanded {
     }
 
     // only as second step handle expand to many, or else keys might still be unknown
-    this._toMany({ entity, readToOneCQN, tableAlias, toManyColumns, toManyTree, mappings, defaultLanguage })
+    this._toMany({
+      entity,
+      readToOneCQN,
+      tableAlias,
+      toManyColumns,
+      toManyTree,
+      mappings,
+      defaultLanguage,
+      readToOneCQNCopy
+    })
   }
 
   adjustOrderBy(orderBy, mappings, column, tableAlias) {
@@ -822,23 +848,12 @@ class JoinCQNFromExpanded {
     // No sub select
     const subSelectColumns = this._getSubSelectColumns(readToOneCQN)
 
-    const navigation = getNavigationIfStruct(entity, tableAlias === columns[0] ? columns.slice(1) : columns)
-    const onConditionOptions = {
-      associationNames: columns,
-      csn: this._csn,
-      aliases: {
-        select: tableAlias,
-        join: parentAlias
-      },
-      resolveView: false
-    }
-
     if (subSelectColumns.length === 0) {
-      return getOnCond(navigation, onConditionOptions)
+      return entity._relations[tableAlias === columns[0] ? columns.slice(1) : columns].join(tableAlias, parentAlias)
     }
 
     const aliases = this._getAliases(subSelectColumns)
-    const on = getOnCond(navigation, onConditionOptions)
+    const on = entity._relations[tableAlias === columns[0] ? columns.slice(1) : columns].join(tableAlias, parentAlias)
 
     for (const element of on) {
       if (element.ref && aliases[element.ref[0]] && aliases[element.ref[0]][element.ref[1]]) {
@@ -968,7 +983,16 @@ class JoinCQNFromExpanded {
     return DRAFT_COLUMNS.includes(ref[0])
   }
 
-  _toMany({ entity, readToOneCQN, tableAlias, toManyColumns, toManyTree, mappings, defaultLanguage }) {
+  _toMany({
+    entity,
+    readToOneCQN,
+    tableAlias,
+    toManyColumns,
+    toManyTree,
+    mappings,
+    defaultLanguage,
+    readToOneCQNCopy
+  }) {
     if (toManyColumns.length === 0) {
       return
     }
@@ -979,7 +1003,7 @@ class JoinCQNFromExpanded {
       const select = this._buildExpandedCQN({
         column,
         entity,
-        readToOneCQN,
+        readToOneCQN: readToOneCQNCopy,
         toManyTree,
         mappings,
         parentAlias,
@@ -1069,15 +1093,7 @@ class JoinCQNFromExpanded {
       !this._csn.definitions[colTarget]._isDraftEnabled
     const ref = this._getJoinRef(entity.elements, colRef[0], expandActive, defaultLanguageThis)
     const tableAlias = this._createAlias(toManyTree.concat(colRef).join(':'))
-    const onConditionOptions = {
-      associationNames: colRef[0],
-      csn: this._csn,
-      aliases: {
-        select: tableAlias,
-        join: 'filterExpand'
-      }
-    }
-    const on = getOnCond(element, onConditionOptions)
+    const on = entity._relations[colRef[0]].join(tableAlias, 'filterExpand')
     const filterExpand = this._getFilterExpandCQN(readToOneCQN, on, parentAlias, entity.keys)
     const expandedEntity = this._csn.definitions[colTarget]
     const joinColumns = this._getJoinColumnsFromOnAddToMapping(mappings[colRef[0]], parentAlias, on, entity)
@@ -1529,8 +1545,13 @@ class JoinCQNFromExpanded {
   }
 
   _isNotIncludedIn(columns) {
+    if (columns.some(column => isAsteriskColumn(column))) return _ => false
     return entry =>
-      !columns.some(column => (column.ref && column.ref[1] === entry) || ('val' in column && column.as === entry))
+      !columns.some(
+        column =>
+          (typeof column === 'object' && column.ref && column.ref[1] === entry) ||
+          ('val' in column && column.as === entry)
+      )
   }
 
   /**

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

@@ -95,7 +95,7 @@ class RawToExpanded {
 
         // the expanded items may include the actives of the deleted drafts -> filter out
         if (rootIsActiveEntity !== null) {
-          if (mapping[TO_ACTIVE]) expandedItems = expandedItems.filter(ele => ele.IsActiveEntity === true)
+          if (mapping[TO_ACTIVE]) expandedItems = expandedItems.filter(ele => ele.IsActiveEntity !== false)
           else expandedItems = expandedItems.filter(ele => ele.IsActiveEntity === rootIsActiveEntity)
         }
 
@@ -119,6 +119,7 @@ class RawToExpanded {
           row[key] = parsed || null
         } else if (rootIsActiveEntity !== null) {
           if (mapping[TO_ACTIVE]) row[key] = parsed && parsed.IsActiveEntity !== false ? parsed : null
+          else if (rootIsActiveEntity) row[key] = parsed && parsed.IsActiveEntity !== false ? parsed : null
           else row[key] = parsed && parsed.IsActiveEntity === rootIsActiveEntity ? parsed : null
         }
       } else {

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

@@ -1,28 +1,13 @@
-// REVISIT: use templating mechanism (resp. results.metadata, once available) to make more efficient
-
 const { getEntityFromCQN } = require('../../common/utils/entityFromCqn')
+const getTemplate = require('../../common/utils/template')
+const templateProcessor = require('../../common/utils/templateProcessor')
 
-const _toArray = (result, elements) => {
-  // REVISIT: This is a very expensive loop in loop...
-  // and 100% overhead the results don't contain arrayed elements,
-  // and 100% of all currently existing stakeholder projects don't.
-  // but that's not that easy to fix -> see comment about results.metadata below
-  for (const row of result) {
-    for (const column in row) {
-      if (elements[column] === undefined || row[column] === undefined) continue
+const _pick = element => {
+  if (element.kind === 'element' && element.items) return 'arrayed'
+}
 
-      // .items marks arrayed element
-      if (elements[column].items) {
-        row[column] = JSON.parse(row[column])
-      } else if (elements[column].is2many) {
-        _toArray(row[column], elements[column]._target.elements)
-      } else if (elements[column].is2one) {
-        _toArray([row[column]], elements[column]._target.elements)
-      } else if (elements[column].elements) {
-        _toArray([row[column]], elements[column].elements)
-      }
-    }
-  }
+const _processFn = ({ row, key, plain }) => {
+  if (plain === 'arrayed' && row && row[key]) row[key] = JSON.parse(row[key])
 }
 
 /**
@@ -35,12 +20,12 @@ const _toArray = (result, elements) => {
 module.exports = function (result, req) {
   if (!this.model) return
 
-  if (!Array.isArray(result)) result = [result]
-
-  // REVISIT: We need results.metadata to make that more efficient
-  // results.metadata ~= cds.infer(req.query).metadata
-  // REVISIT: No entity for sets/unions outside of common draft scenarios
   const entity = getEntityFromCQN(req, this)
   if (!entity) return
-  if (entity) _toArray(result, entity.elements)
+
+  const template = getTemplate('db-arrayed', this, entity, { pick: _pick })
+  if (template.elements.size === 0) return
+
+  for (const row of Array.isArray(result) ? result : [result])
+    templateProcessor({ processFn: _processFn, row, template })
 }

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

@@ -31,6 +31,7 @@ module.exports = async function (req) {
     // If entry is available, reject event
     // REVISIT: db specifics
     if (err.message.match(/unique constraint/i)) {
+      err.originalMessage = err.message
       err.message = 'ENTITY_ALREADY_EXISTS'
       err.code = 400
     }

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

@@ -13,8 +13,8 @@ const cds = require('../../cds')
 
 const normalizeTimeData = require('../utils/normalizeTimeData')
 
-const enrichDataWithKeysFromWhere = require('../../common/utils/enrichWithKeysFromWhere')
-const { foreignKeyPropagations, propagateForeignKeys } = require('../../common/utils/foreignKeyPropagations')
+const { enrichDataWithKeysFromWhere } = require('../../common/utils/keys')
+const { propagateForeignKeys } = require('../../common/utils/propagateForeignKeys')
 const getTemplate = require('../../common/utils/template')
 const templateProcessor = require('../../common/utils/templateProcessor')
 
@@ -25,13 +25,13 @@ const { DRAFT_COLUMNS_MAP } = require('../../common/constants/draft')
 const _isManaged = (category, event) =>
   (category === '@cds.on.insert' && event === 'CREATE') || (category === '@cds.on.update' && event === 'UPDATE')
 
-const _processComplexCategory = ({ row, key, val, category, req }) => {
+const _processComplexCategory = ({ row, key, val, category, req, element }) => {
   const categoryArgs = category.args
   category = category.category
 
   // propagate keys
   if (category === 'propagateForeignKeys') {
-    propagateForeignKeys(key, row, categoryArgs.foreignKeyPropagations, { onlyWriteCompositionEffective: true })
+    propagateForeignKeys(key, row, element._foreignKeys, element._isCompositionEffective)
     return
   }
 
@@ -63,7 +63,7 @@ const _processComplexCategory = ({ row, key, val, category, req }) => {
 const _processCategory = ({ category, row, key, element, val, req }) => {
   // use args only inside this if (sonar type error warning)
   if (typeof category === 'object') {
-    _processComplexCategory({ category, row, key, val, req })
+    _processComplexCategory({ category, row, key, val, req, element })
     return
   }
 
@@ -136,12 +136,8 @@ const _pick = element => {
     categories.push('associationEffective')
   }
 
-  if (element.isAssociation) {
-    const _foreignKeyPropagations = foreignKeyPropagations(element)
-
-    if (_foreignKeyPropagations) {
-      categories.push({ category: 'propagateForeignKeys', args: { foreignKeyPropagations: _foreignKeyPropagations } })
-    }
+  if (element.isAssociation && element._foreignKeys.length) {
+    categories.push({ category: 'propagateForeignKeys' })
   }
 
   // generate uuid

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

@@ -1,7 +1,7 @@
 const cds = require('../../cds')
 const { SELECT } = cds.ql
 
-const cqn2cqn4sql = require('../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const { getDependents } = require('../../common/utils/csn')
 
 const CRUD = {
@@ -54,7 +54,7 @@ async function beforeDelete(req) {
     select = select.where(req.query.DELETE.where)
   }
 
-  select = cqn2cqn4sql(select, this.model)
+  select = cqn2cqn4sql(select, this.model, { service: this })
 
   req._beforeDeleteData = await this._read(this.model, this.dbc, select, req.context || req)
 }

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

@@ -1,6 +1,5 @@
-const cqn2cqn4sql = require('../../common/utils/cqn2cqn4sql')
+const { cqn2cqn4sql } = require('../../common/utils/cqn2cqn4sql')
 const generateAliases = require('../utils/generateAliases')
-const rewriteAsterisk = require('../../common/utils/rewriteAsterisk')
 const { restoreLink } = require('../../common/utils/resolveView')
 
 const _isLinked = req => {
@@ -21,13 +20,11 @@ function handler(req) {
   const streaming = req.query._streaming
   const validationQuery = req.query._validationQuery
 
-  rewriteAsterisk(req)
-
   // for restore link to req.data
   const linked = _isLinked(req)
 
   // convert to sql cqn
-  req.query = cqn2cqn4sql(req.query, this.model)
+  req.query = cqn2cqn4sql(req.query, this.model, { service: this })
 
   // REVISIT: should not be necessary
   // restore link to req.data

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

@@ -75,6 +75,7 @@ module.exports = async function (req) {
   } catch (err) {
     // REVISIT: db specifics
     if (err.message.match(/unique constraint/i)) {
+      err.originalMessage = err.message
       err.message = 'UNIQUE_CONSTRAINT_VIOLATION'
       err.code = 400
     }

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

@@ -10,8 +10,8 @@ function _arrayWithCount(a, count) {
 }
 
 function _createCountQuery(query) {
-  const _query = JSON.parse(JSON.stringify(query)) // REVISIT: Use query.clone() insteadconst _query = JSON.parse(JSON.stringify(query))
-  _query.SELECT.columns = [{ func: 'count', args: [{ val: 1 }], as: '_counted_' }]
+  const _query = JSON.parse(JSON.stringify(query)) // REVISIT: Use query.clone() instead
+  _query.SELECT.columns = [{ func: 'count', args: [{ val: 1 }], as: '$count' }]
   delete _query.SELECT.groupBy
   delete _query.SELECT.limit
   delete _query.SELECT.orderBy // not necessary to keep that
@@ -25,6 +25,11 @@ function _createCountQuery(query) {
   return _query
 }
 
+const countValue = countResult => {
+  if (countResult._counted_ != null) return countResult._counted_
+  if (countResult.$count != null) return countResult.$count
+}
+
 const read = (executeSelectCQN, executeStreamCQN) => (model, dbc, query, req) => {
   const { user, locale, timestamp } = req
   const isoTs = timestampToISO(timestamp)
@@ -45,11 +50,11 @@ const read = (executeSelectCQN, executeStreamCQN) => (model, dbc, query, req) =>
       const countResultPromise = executeSelectCQN(model, dbc, countQuery, user, locale, isoTs)
       if (query.SELECT.limit.rows && query.SELECT.limit.rows.val === 0) {
         // We don't need to perform our result query
-        return countResultPromise.then(countResult => _arrayWithCount([], countResult[0]._counted_))
+        return countResultPromise.then(countResult => _arrayWithCount([], countValue(countResult[0])))
       } else {
         const resultPromise = executeSelectCQN(model, dbc, query, user, locale, isoTs)
         return Promise.all([countResultPromise, resultPromise]).then(([countResult, result]) =>
-          _arrayWithCount(result, countResult[0]._counted_)
+          _arrayWithCount(result, countValue(countResult[0]))
         )
       }
     } else {

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

@@ -390,8 +390,13 @@ class SelectBuilder extends BaseBuilder {
           }
         }
       }
-
-      const { sql, values } = new this.ReferenceBuilder(element, this._options, this._csn).build()
+      const { sql, values } = new this.ReferenceBuilder(
+        Object.assign({}, element, {
+          sort: Object.prototype.hasOwnProperty.call(element, 'sort') ? element.sort : true
+        }),
+        this._options,
+        this._csn
+      ).build()
       sqls.push(sql)
       this._outputObj.values.push(...values)
     }

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

@@ -1,4 +1,5 @@
 const getColumns = require('../utils/columns')
+//  REVISIT: Remove support for @odata.on... with @sap/cds ^6
 const ANNOTATIONS = ['@cds.on.insert', '@odata.on.insert', '@cds.on.update', '@odata.on.update']
 const { ensureNoDraftsSuffix } = require('../../common/utils/draft')
 

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

@@ -3,17 +3,6 @@ const resolveStructured = require('../../common/utils/resolveStructured')
 
 const { DRAFT_COLUMNS } = require('../../common/constants/draft')
 
-const _filterAssociationAndComposition = (entity, columnName) => {
-  return entity.elements[columnName]
-    ? entity.elements[columnName].is2one !== true && entity.elements[columnName].is2many !== true
-    : true
-}
-const _filterDraft = (entity, columnName) => {
-  return DRAFT_COLUMNS.includes(columnName) !== true && _filterAssociationAndComposition(entity, columnName)
-}
-
-const _mapNameToValue = (entity, array) => array.map(key => entity.elements[key] || { name: key })
-
 /**
  * This method gets all columns for an entity.
  * It includes the generated foreign keys from managed associations, structured elements and complex and custom types.
@@ -22,42 +11,24 @@ const _mapNameToValue = (entity, array) => array.map(key => entity.elements[key]
  * @param entity - the csn entity
  * @returns {Array} - array of columns
  */
-const getColumns = entity => {
+const getColumns = (entity, { db, onlyKeys } = { db: true, onlyKeys: false }) => {
   // REVISIT is this correct or just a problem that occurs because of new structure we do not deal with yet?
-  if (!entity.elements) return []
-
-  let columnNames
+  if (!(entity && entity.elements)) return []
+  const columnNames = []
   // REVISIT!!!
-  const proto = Object.getPrototypeOf(entity.elements)
-  if (proto) columnNames = Object.keys(proto)
-  else columnNames = Object.keys(entity.elements)
-
-  if (cds.env.effective.odata.structs) {
-    const toBeDeleted = []
-    for (const column of columnNames) {
-      const element = entity.elements[column]
-      if (element && element.elements) {
-        toBeDeleted.push(column)
-        columnNames.push(
-          ...resolveStructured({ structName: element.name, structProperties: [] }, element.elements, false)
-        )
-      }
+  const elements = Object.getPrototypeOf(entity.elements) || entity.elements
+  for (const elementName in elements) {
+    const element = elements[elementName]
+    if (onlyKeys && !element.key) continue
+    if (element.isAssociation) continue
+    if (db && entity._isDraftEnabled && DRAFT_COLUMNS.includes(elementName)) continue
+    if (cds.env.effective.odata.structs && element.elements) {
+      columnNames.push(...resolveStructured({ structName: elementName, structProperties: [] }, element.elements, false))
+      continue
     }
-
-    columnNames = columnNames.filter(col => !toBeDeleted.includes(col))
+    columnNames.push(elementName)
   }
-
-  if (entity && entity._isDraftEnabled) {
-    return _mapNameToValue(
-      entity,
-      columnNames.filter(key => _filterDraft(entity, key))
-    )
-  }
-
-  return _mapNameToValue(
-    entity,
-    columnNames.filter(key => _filterAssociationAndComposition(entity, key))
-  )
+  return columnNames.map(name => elements[name] || { name })
 }
 
 module.exports = getColumns

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

@@ -93,6 +93,7 @@ const _draftCompositionTree = async (service, req) => {
   }
 
   if (results[1].length === 1) {
+    _removeIsActiveEntityRecursively(results[1])
     activeData = results[1][0]
   }
 
@@ -175,8 +176,8 @@ const _handler = async function (req) {
   return result
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('draftActivate', entity, _handler)
   }
-}
+})

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

@@ -186,7 +186,7 @@ const _deleteCancel = async function (req) {
   await _addDraftDataFromExistingDraft(req, this)
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   _new._initial = true
   _patchUpdate._initial = true
   _deleteCancel._initial = true
@@ -196,4 +196,4 @@ module.exports = function () {
     this.before(['PATCH', 'UPDATE'], entity, _patchUpdate)
     this.before(['DELETE', 'CANCEL'], entity, _deleteCancel)
   }
-}
+})

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

@@ -1,3 +1,4 @@
+const cds = require('../../cds')
 const { deleteDraft } = require('../utils/delete')
 
 /**
@@ -11,8 +12,8 @@ const _handler = function (req) {
   return deleteDraft(req, this)
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('CANCEL', entity, _handler)
   }
-}
+})

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

@@ -1,3 +1,4 @@
+const cds = require('../../cds')
 const { deleteDraft } = require('../utils/delete')
 
 /**
@@ -13,8 +14,8 @@ const _handler = function (req) {
   return deleteDraft(req, this, true)
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('DELETE', entity, _handler)
   }
-}
+})

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

@@ -106,7 +106,7 @@ const _handler = async function (req) {
   // Only allows one active entity to be processed at a time, locking out other
   // users who need to edit the same record simultaneously.
   // .forUpdate(): lock the record, a wait of 0 is equivalent to no wait
-  const lockRecordCQN = SELECT.from(lockTargetEntity).where(lockWhere).forUpdate({ wait: 0 })
+  const lockRecordCQN = SELECT.from(lockTargetEntity, [1]).where(lockWhere).forUpdate({ wait: 0 })
 
   const columnNames = getColumns(req.target, { onlyNames: true, filterVirtual: true })
   const rootCQN = SELECT.from(req.target, columnNames).where(rootWhere)
@@ -172,8 +172,8 @@ const _handler = async function (req) {
   return Object.assign({}, results[0][0], { HasDraftEntity: false, HasActiveEntity: true, IsActiveEntity: false })
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('EDIT', entity, _handler)
   }
-}
+})

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

@@ -96,8 +96,8 @@ const _handler = async function (req, next) {
   return result[0]
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('NEW', entity, _handler)
   }
-}
+})

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

@@ -91,8 +91,8 @@ const _handler = async function (req) {
   return result[0]
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('PATCH', entity, _handler)
   }
-}
+})

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

@@ -50,8 +50,8 @@ const _handler = async function (req) {
   return result[0]
 }
 
-module.exports = function () {
+module.exports = cds.service.impl(function () {
   for (const entity of Object.values(this.entities).filter(e => e._isDraftEnabled)) {
     this.on('draftPrepare', entity, _handler)
   }
-}
+})