@sap/cds 5.7.1 → 5.7.2

package/CHANGELOG.md

@@ -4,6 +4,16 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 5.7.2 - 2021-12-09
+
+### Fixed
+
+- Instance-based restriction for activation of draft enabled entities
+- `.columns('*')` on projections of remote services using renamed properties
+- GraphQL filters on nested fields are now applied correctly
+- Performance degradation during processing of `where exists`
+- Read drafts via navigation with complex filter expression
+
 ## Version 5.7.1 - 2021-12-06
 
 ### Fixed

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

@@ -8,7 +8,7 @@ const { SELECT } = cds.ql
 const { getRequiresAsArray } = require('../utils/auth')
 const { cqn2cqn4sql } = require('../utils/cqn2cqn4sql')
 const { isActiveEntityRequested, removeIsActiveEntityRecursively } = require('../../fiori/utils/where')
-const { ensureDraftsSuffix, ensureNoDraftsSuffix } = require('../../fiori/utils/handler')
+const { ensureNoDraftsSuffix } = require('../../fiori/utils/handler')
 const { rewriteExpandAsterisk } = require('../../common/utils/rewriteAsterisks')
 
 const WRITE = ['CREATE', 'UPDATE', 'DELETE']
@@ -445,12 +445,11 @@ const _getUnrestrictedCount = async req => {
 const _getRestrictedCount = async (req, model, resolvedApplicables) => {
   const dbtx = cds.tx(req)
 
-  let target =
+  const target =
     (req.query.UPDATE && req.query.UPDATE.entity) ||
     (req.query.DELETE && req.query.DELETE.from) ||
     (req.query.SELECT && req.query.SELECT.from)
-  // REVISIT: req._ gets set in onDraftActivate to original req
-  if (req._ && req._.event === 'draftActivate') target = ensureDraftsSuffix(target)
+
   const selectRestricted = SELECT.one(['count(*) as n']).from(target)
 
   const whereRestricted = (req.query.UPDATE && req.query.UPDATE.where) || (req.query.DELETE && req.query.DELETE.where)

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

@@ -445,35 +445,36 @@ const _ensureExpandedNestedWhereExists = ({ ref }, aliases) => {
   return { ref: [acc] }
 }
 
-const convertWhereExists = (cqn, model, options) => {
-  function _recurse(where) {
-    where.forEach((element, index) => {
-      // ensure where exists are fully expanded
-      if (where && where.some(ele => ele === 'exists')) {
-        where.forEach((element, index) => {
-          if (element === 'exists' && where[index + 1].ref) {
-            const aliases = cqn.SELECT.from.as
-              ? [cqn.SELECT.from.as]
-              : cqn.SELECT.from.join
-              ? cqn.SELECT.from.args.map(arg => arg.as)
-              : []
-            where[index + 1] = _ensureExpandedNestedWhereExists(where[index + 1], aliases)
-          }
-        })
-      }
+const _convertWhereExists = (where, cqn, model, options) => {
+  for (let i = 0; i < where.length; i++) {
+    const element = where[i]
+
+    // ensure where exists are fully expanded
+    if (
+      (element === 'exists' && where[i + 1].ref && where[i > 1 ? i - 1 : 0] !== 'not') ||
+      (element === 'not' && where[i + 1] === 'exists' && where[i + 2].ref)
+    ) {
+      const offset = element === 'not' ? 2 : 1
+      const aliases = cqn.SELECT.from.as
+        ? [cqn.SELECT.from.as]
+        : cqn.SELECT.from.join
+        ? cqn.SELECT.from.args.map(arg => arg.as)
+        : []
+      where[i + offset] = _ensureExpandedNestedWhereExists(where[i + offset], aliases)
+    }
 
-      if (element.xpr) {
-        _recurse(element.xpr) // recursing into nested {xpr}
-      } else if (element === 'exists' && _isAny(where[index + 1])) {
-        where[index + 1] = _getWhereExistsSubSelect(cqn, where, index + 1, model, options)
-      } else if (element === 'not' && where[index + 1] === 'exists' && _isAll(where[index + 2])) {
-        where[index + 2] = _getWhereExistsSubSelect(cqn, where, index + 2, model, options)
-      }
-    })
+    if (element.xpr) {
+      _convertWhereExists(element.xpr) // > recursing into nested {xpr}
+    } else if (element === 'exists' && _isAny(where[i + 1])) {
+      where[i + 1] = _getWhereExistsSubSelect(cqn, where, i + 1, model, options)
+    } else if (element === 'not' && where[i + 1] === 'exists' && _isAll(where[i + 2])) {
+      where[i + 2] = _getWhereExistsSubSelect(cqn, where, i + 2, model, options)
+    }
   }
+}
 
-  const where = cqn.SELECT.where
-  if (where) _recurse(where)
+const convertWhereExists = (cqn, model, options) => {
+  if (cqn.SELECT.where) _convertWhereExists(cqn.SELECT.where, cqn, model, options)
 }
 
 const _getRefIndex = (where, index) => {

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

@@ -338,7 +338,7 @@ const _newSelect = (query, transitions, service) => {
   if (!newSelect.columns && targetTransition.mapping.size) newSelect.columns = _initialColumns(targetTransition)
   if (newSelect.columns) {
     const isDB = service instanceof cds.DatabaseService
-    rewriteAsterisks({ SELECT: newSelect }, service.model, isDB)
+    rewriteAsterisks({ SELECT: query.SELECT }, service.model, isDB)
     newSelect.columns = _newColumns(newSelect.columns, targetTransition, service, service.kind !== 'app-service')
   }
   if (newSelect.having) newSelect.having = _newColumns(newSelect.having, targetTransition)

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

@@ -1084,6 +1084,10 @@ const _adaptSubSelects = ({ SELECT: { from, where } }, scenario) => {
       }
     } else if (element.SELECT) {
       _adaptSubSelects(element, scenario)
+    } else if (element.xpr) {
+      for (const ele of element.xpr.filter(e => e.SELECT)) {
+        _adaptSubSelects(ele, scenario)
+      }
     }
   }
 }

package/libx/gql/resolvers/parse/ast2cqn/columns.js

@@ -19,7 +19,7 @@ const astToColumns = selections => {
 
     const filter = getArgumentByName(selection.arguments, ARGUMENT.FILTER)
     if (filter) {
-      column.where = astToWhere(filter).xpr
+      column.where = astToWhere(filter)
     }
 
     const orderBy = getArgumentByName(selection.arguments, ARGUMENT.ORDER_BY)

package/package.json

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