@sap/cds-compiler 4.2.2 → 4.2.4

package/CHANGELOG.md

@@ -7,6 +7,12 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 4.2.4 - 2023-09-14
+
+### Fixed
+
+- OData: For compatibility with the Java runtime, don't prepend table aliases to column aliases unless necessary.
+
 ## Version 4.2.2 - 2023-08-31
 
 ### Fixed

package/lib/base/model.js

@@ -46,6 +46,7 @@ const availableDeprecatedFlags = {
   includesNonShadowedFirst: true,
   eagerPersistenceForGeneratedEntities: true,
   noKeyPropagationWithExpansions: true,
+  ignoreSpecifiedQueryElements: true,
 }
 
 const oldDeprecatedFlags_v2 = [

package/lib/transform/db/expansion.js

@@ -7,7 +7,7 @@ const {
   walkCsnPath,
   getUtils,
 } = require('../../model/csnUtils');
-const { implicitAs, columnAlias } = require('../../model/csnRefs');
+const { implicitAs, columnAlias, pathId } = require('../../model/csnRefs');
 const { setProp } = require('../../base/model');
 const { forEach } = require('../../utils/objectUtils');
 
@@ -39,9 +39,10 @@ function expandStructureReferences( csn, options, pathDelimiter, messageFunction
         // TODO: replace with the correct options.transformation?
         // Do not expand the * in OData for a moment, not to introduce changes
         // while the OData CSN is still official
+        const isComplexQuery = parent.from.join !== undefined;
         if (!options.toOdata)
-          parent.columns = replaceStar(root, columns, parent.excluding, parent.from.join !== undefined);
-        parent.columns = expand(parent.columns, path.concat('columns'), true);
+          parent.columns = replaceStar(root, columns, parent.excluding, isComplexQuery);
+        parent.columns = expand(parent.columns, path.concat('columns'), true, isComplexQuery);
       }
     },
     groupBy: (parent, name, groupBy, path) => {
@@ -512,16 +513,17 @@ function expandStructureReferences( csn, options, pathDelimiter, messageFunction
    * @param {Array} thing
    * @param {CSN.Path} path
    * @param {boolean} [withAlias=false] Whether to "expand" the (implicit) alias as well.
+   * @param {boolean} [isComplexQuery]
    * @returns {Array} New array - with all structured things expanded
    */
-  function expand( thing, path, withAlias = false ) {
+  function expand( thing, path, withAlias = false, isComplexQuery = false ) {
     const newThing = [];
     for (let i = 0; i < thing.length; i++) {
       const col = thing[i];
       if (col.ref && col.$scope !== '$magic') {
         const _art = col._art || csnUtils.inspectRef(path.concat(i)).art;
         if (_art && csnUtils.isStructured(_art))
-          newThing.push(...expandRef(_art, col, withAlias));
+          newThing.push(...expandRef(_art, col, withAlias, isComplexQuery));
         else
           newThing.push(col);
       }
@@ -596,9 +598,10 @@ function expandStructureReferences( csn, options, pathDelimiter, messageFunction
    * @param {CSN.Element} art
    * @param {object} root Column, ref in order by, etc.
    * @param {boolean} withAlias Whether to add an explicit flattened alias to the expanded columns/references.
+   * @param {boolean} [isComplexQuery]
    * @returns {Array}
    */
-  function expandRef( art, root, withAlias ) {
+  function expandRef( art, root, withAlias, isComplexQuery ) {
     return _expandStructCol(art, columnAlias(root), root.ref, ( currentRef, currentAlias) => {
       const obj = { ...root, ref: currentRef };
       if (withAlias) {
@@ -613,7 +616,13 @@ function expandStructureReferences( csn, options, pathDelimiter, messageFunction
           setProp(obj, '$implicitAlias', true);
       }
 
-      if (typeof root.$env === 'string')
+      // The Java runtime, as of 2023-09-13, assumes that for _simple projections_, all references
+      // are relative to the query source.  To avoid breaking that assumption unless necessary,
+      // we only add the table alias if:
+      //  - it is a complex query with possibly multiple available table aliases, or
+      //  - the transformation is not for OData (which is used by Java), or
+      //  - the first path step has the same name as the table alias (only one, as otherwise the query would be complex)
+      if (typeof root.$env === 'string' && (isComplexQuery || options.transformation !== 'odata' || root.$env === pathId(obj.ref[0])))
         obj.ref = [ root.$env, ...obj.ref ];
 
       return obj;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "4.2.2",
+  "version": "4.2.4",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",