@sap/cds 7.1.0 → 7.1.1

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 7.1.1 - 2023-08-01
+
+### Fixed
+
+- Lean draft: read actives via service on draft edit
+- Resolve column name for `STREAM` CQN queries that point to views
+- Only log the error in case of an unhandled rejection
+
 ## Version 7.1.0 - 2023-07-28
 
 ### Added

package/bin/serve.js

@@ -206,8 +206,8 @@ async function serve (all=[], o={}) {
 
     const LOG = cds.log('cli|server')
     cds.shutdown = _shutdown //> for programmatic invocation
-    process.on('unhandledRejection', (e,p) => _shutdown (e, LOG.error('❗️Uncaught',p)))
-    process.on('uncaughtException', (e) => _shutdown (e, LOG.error('❗️Uncaught',e)))
+    process.on('unhandledRejection', e => _shutdown (e, cds.log('cds').error('❗️Uncaught',e)))
+    process.on('uncaughtException', e => _shutdown (e, cds.log('cds').error('❗️Uncaught',e)))
     process.on('SIGINT', cds.watched ? _shutdown : (s,n)=>_shutdown(s,n,console.log())) //> newline after ^C
     process.on('SIGHUP', _shutdown)
     process.on('SIGHUP2', _shutdown)

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

@@ -60,7 +60,7 @@ exports.impl = cds.service.impl(function () {
     }
 
     if (req.event === 'READ' && req.query?.SELECT) {
-      req.query.SELECT.localized = true
+      req.query.SELECT.localized ??= true
     }
 
     if (!result) {

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

@@ -346,6 +346,8 @@ const _getWhereExistsSubSelect = (queryTarget, outerAlias, innerAlias, ref, mode
     if (condition.length > 1 || (condition.length === 1 && !('val' in condition[0]))) subSelect.where(condition)
   }
 
+  if (options.localized != null) subSelect.SELECT.localized = options.localized
+
   subSelect.where(queryTarget._relations[navName].join(innerAlias, outerAlias))
   if (cds.env.effective.odata.structs || cds.env.features.ucsn_struct_conversion) {
     flattenStructuredSelect(subSelect, model)
@@ -354,6 +356,7 @@ const _getWhereExistsSubSelect = (queryTarget, outerAlias, innerAlias, ref, mode
 
   // nested where exists needs recursive conversion
   options.lambdaIteration++
+
   return _convertSelect(subSelect, model, options)
 }
 
@@ -711,10 +714,11 @@ const _convertToOneEqNullInFilter = (query, target) => {
     }
   }
 }
+
 // eslint-disable-next-line complexity
 const _convertSelect = (query, model, _options) => {
   const _4db = _options.service?.isDatabaseService
-  const options = Object.assign({ _4db, isStreaming: query._streaming }, _options)
+  const options = Object.assign({ _4db, isStreaming: query._streaming, localized: query.SELECT.localized }, _options)
 
   // ensure query is ql enabled
   if (!(query instanceof Query)) Object.setPrototypeOf(query, Object.getPrototypeOf(SELECT()))

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

@@ -419,7 +419,7 @@ const _newStream = (query, transitions) => {
   } else {
     newStream.into = targetName
   }
-  if (newStream.column) newStream.column = _resolveColumn([newStream.column], targetTransition)
+  if (newStream.column) newStream.column = _resolveColumn(newStream.column, targetTransition)
   Object.defineProperty(newStream, '_transitions', {
     enumerable: false,
     value: transitions

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

@@ -11,7 +11,7 @@ const _redirectXpr = (xpr, localize) => {
       }
 
       if (ele.SELECT) {
-        if (!ele._suppressLocalization) redirect(ele.SELECT, localize)
+        if (ele.SELECT.localized) redirect(ele.SELECT, localize)
       }
     })
 }

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

@@ -115,7 +115,7 @@ const fioriGenericEdit = async function (req, next) {
   for (const q of selectCQNs) {
     const entity = definitions[q.SELECT.from.ref[0]]
     if (entity && !entity.name.match(/\.texts$/)) {
-      Object.defineProperty(q, '_suppressLocalization', { value: true })
+      q.SELECT.localized = false
     }
   }
 

package/libx/_runtime/fiori/lean-draft.js

@@ -967,7 +967,7 @@ async function onEdit(req) {
   existingDraft[DRAFT_PARAMS] = draftParams
 
   const activeCQN = SELECT.one.from(req.target).columns(cols).where(targetWhere)
-  activeCQN._suppressLocalization = true // in the future we should be able to just set activeCQN.SELECT.localized = false
+  activeCQN.SELECT.localized = false
 
   const activeCheck = SELECT.one(req.target).columns([1]).where(targetWhere).forUpdate()
   activeCheck[DRAFT_PARAMS] = draftParams
@@ -979,7 +979,8 @@ async function onEdit(req) {
   } catch {} // eslint-disable-line no-empty
 
   const [res, draft] = await _promiseAll([
-    this._datasource.run(activeCQN),
+    // REVISIT: inofficial compat flag just in case it breaks something -> do not document
+    cds.env.fiori.read_actives_from_db ? this._datasource.run(activeCQN) : this.run(activeCQN),
     // no user check must be done here...
     existingDraft
   ])

package/libx/_runtime/hana/localized.js

@@ -21,7 +21,7 @@ const localizedHandler = function (req) {
   if (!req.locale) return
 
   // suppress localization by instruction
-  if (query._suppressLocalization) return
+  if (query.SELECT.localized === false) return
 
   // suppress localization for pure counts
   const columns = query.SELECT.columns

package/libx/_runtime/hana/search2cqn4sql.js

@@ -60,8 +60,10 @@ const search2cqn4sql = (query, entity, options) => {
   subQuery.where(expression)
 
   // suppress the localize handler from redirecting the subQuery's target to the localized view
-  Object.defineProperty(subQuery, '_suppressLocalization', { value: true })
+  subQuery.SELECT.localized = false
+
   query.where('exists', subQuery)
+
   return query
 }
 

package/libx/_runtime/sqlite/localized.js

@@ -33,7 +33,7 @@ const sqliteLocalized = function (req) {
   if (!req.locale) return
 
   // suppress localization by instruction
-  if (query._suppressLocalization) return
+  if (query.SELECT.localized === false) return
 
   // suppress localization for pure counts
   const columns = query.SELECT.columns

package/package.json

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