@sap/cds 5.9.4 → 5.9.5

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Version 5.9.5 - 2022-05-09
+
+### Fixed
+
+- `HDB_TCP_KEEP_ALIVE_IDLE` config
+- A combination of `!=` operator and `or` in `where` clauses of `@restrict` annotations or when adjusting `req.query` in custom handlers (OData services only)
+- Programmatic calls to bound actions/functions do have keys in `req.data` again if compat flag `cds.env.features.keys_in_data_compat` is set
+
 ## Version 5.9.4 - 2022-05-02
 
 ### Fixed

package/lib/serve/Service-methods.js

@@ -62,6 +62,25 @@ const add_handler_for = (srv, def) => {
     }
     const {params} = target ? target.actions[event] : def
     if (params) req.data =  _named(args,params) || _positional(args,params)
+
+    // ensure legacy compat, keys in req.data
+    if(cds.env.features.keys_in_data_compat && target) {
+      // named/positional variant of keys
+      const named = req.params.length === 1 && typeof req.params[0] === 'object'
+
+      let pos = 0 //> counter for key in positional variant
+      for (const k in target.keys) {
+        if (req.data[k]) {
+          LOG._warn && LOG.warn(`
+          ${target.name} has defined ${k} as key and action parameter.
+          Key will be used in req.data.      
+          `)
+        }
+        req.data[k] = named ? req.params[0][k] : req.params[pos++]
+      }
+      
+    }
+
     return this.send (req)
   }
   stub._is_stub = true

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

@@ -487,16 +487,16 @@ const _convertNotEqual = (container, partName = 'where') => {
   const where = container[partName]
 
   if (where) {
-    let changed
-    where.forEach((el, index) => {
+    for (let index = 0; index < where.length; index++) {
+      const el = where[index]
       if (el === '!=') {
         const refIndex = _getRefIndex(where, index)
         if (refIndex !== undefined) {
           where[index - 1] = {
             xpr: [where[index - 1], el, where[index + 1], 'or', where[refIndex], '=', { val: null }]
           }
-          where[index] = where[index + 1] = undefined
-          changed = true
+          where.splice(index, 2)
+          --index
         }
       }
 
@@ -504,11 +504,6 @@ const _convertNotEqual = (container, partName = 'where') => {
         if (el.SELECT) _convertNotEqual(el.SELECT, partName)
         if (el.xpr) _convertNotEqual(el, 'xpr')
       }
-    })
-
-    // delete undefined values
-    if (changed) {
-      container[partName] = where.filter(el => el)
     }
   }
 

package/libx/_runtime/hana/driver.js

@@ -37,7 +37,7 @@ function _connectHdb(creds, tenant) {
     // tls keep alive
     if (process.env.HDB_TCP_KEEP_ALIVE_IDLE) {
       const num = Number(process.env.HDB_TCP_KEEP_ALIVE_IDLE)
-      creds.tcpKeepAliveIdle = Number.NaN(num) ? false : num
+      creds.tcpKeepAliveIdle = Number.isNaN(num) ? false : num
     }
 
     const hdbClient = this.createClient(creds)

package/libx/_runtime/remote/Service.js

@@ -41,7 +41,7 @@ const _buildPartialUrlFunctions = (url, data, params, kind = 'odata-v4') => {
   const funcParams = []
   const queryOptions = []
   // REVISIT: take params from params after importer fix (the keys should not be part of params)
-  for (const param in data) {
+  for (const param in _extractParamsFromData(data, params)) {
     if (kind === 'odata-v2') {
       funcParams.push(`${param}=${_setCorrectValue(param, data, params, kind)}`)
     } else {
@@ -54,7 +54,7 @@ const _buildPartialUrlFunctions = (url, data, params, kind = 'odata-v4') => {
     : `${url}(${funcParams.join(',')})?${queryOptions.join('&')}`
 }
 
-const _extractParamsFromData = (data, params) => {
+const _extractParamsFromData = (data, params = {}) => {
   return Object.keys(data).reduce((res, el) => {
     if (params[el]) Object.assign(res, { [el]: data[el] })
     return res
@@ -118,7 +118,7 @@ const _handleV2BoundActionFunction = (srv, def, req, event, kind) => {
   const params = []
   const data = req.data
   // REVISIT: take params from def.params, after importer fix (the keys should not be part of params)
-  for (const param in req.data) {
+  for (const param in _extractParamsFromData(req.data, def.params)) {
     params.push(`${param}=${formatVal(data[param], param, { elements: def.params }, kind)}`)
   }
   const keys = _buildKeys(req, this.kind)

package/package.json

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