@sap/cds 5.8.0 → 5.8.3

package/libx/gql/resolvers/crud/update.js

@@ -1,3 +1,5 @@
+const cds = require('../../../../lib')
+
 const { ARGUMENT } = require('../../constants/adapter')
 const { getArgumentByName, astToColumns, astToWhere, astToEntries } = require('../parse/ast2cqn')
 const { entriesStructureToEntityStructure } = require('./utils')
@@ -5,16 +7,14 @@ const { entriesStructureToEntityStructure } = require('./utils')
 module.exports = async (service, entityFQN, selection) => {
   const filter = getArgumentByName(selection.arguments, ARGUMENT.FILTER)
 
-  let queryBeforeUpdate = service.read(entityFQN)
+  const queryBeforeUpdate = service.read(entityFQN)
   queryBeforeUpdate.columns(astToColumns(selection.selectionSet.selections))
 
   if (filter) {
     queryBeforeUpdate.where(astToWhere(filter))
   }
 
-  const resultBeforeUpdate = await service.tx(tx => tx.run(queryBeforeUpdate))
-
-  let query = service.update(entityFQN)
+  const query = service.update(entityFQN)
 
   if (filter) {
     query.where(astToWhere(filter))
@@ -24,7 +24,13 @@ module.exports = async (service, entityFQN, selection) => {
   const entries = entriesStructureToEntityStructure(service, entityFQN, astToEntries(input))
   query.with(entries)
 
-  const result = await service.tx(tx => tx.run(query))
+  let resultBeforeUpdate
+  const result = await service.tx(async tx => {
+    cds.context = tx
+    // read needs to be done before the update, otherwise the where clause might become invalid (case that properties in where clause are updated by the mutation)
+    resultBeforeUpdate = await tx.run(queryBeforeUpdate)
+    return tx.run(query)
+  })
 
   // Merge selected fields with updated data
   return resultBeforeUpdate.map(original => ({ ...original, ...result }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "5.8.0",
+  "version": "5.8.3",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [