@sap/cds-compiler 4.2.4 → 4.3.2

package/lib/transform/translateAssocsToJoins.js

@@ -60,7 +60,7 @@ function translateAssocsToJoins(model, inputOptions = {})
   // create JOINs for foreign key paths
   const noJoinForFK = options.forHana ? !options.joinfk : true;
 
-  // Note: This is called from the 'forHana' transformations, so it is controlled by its options)
+  // Note: This is called from the 'forHana' transformations, so it is controlled by its options
   const pathDelimiter = (options.forHana && options.sqlMapping === 'hdbcds') ? '.' : '_';
 
   forEachDefinition(model, prepareAssociations);
@@ -76,7 +76,9 @@ function translateAssocsToJoins(model, inputOptions = {})
          prepended to all source side paths of the resulting ON condition
          (cut off name.id from name.element)
       */
-      art.$elementPrefix = art.name.element.slice(0, art.name.element.length - art.name.id.length).replace(/\./g, pathDelimiter);
+      art.$elementPrefix = '';
+      for(let parent = art._parent; parent?.kind === 'element'; parent = parent._parent)
+        art.$elementPrefix = parent.name.id + pathDelimiter + art.$elementPrefix;
 
       /*
         Create path prefix tree for Foreign Keys, required to substitute
@@ -207,7 +209,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           let alias = taName;
           if (ta.name.$inferred === '$internal') {
             // query has no explicit table alias, i.e. is internal: make it visible and remove `$`
-            alias = ta.name.alias.replace(/^[$]/, '_');
+            alias = ta.name.id.replace(/^[$]/, '_');
             ta.$inferred = undefined;
             ta.name.$inferred = undefined;
           }
@@ -221,11 +223,11 @@ function translateAssocsToJoins(model, inputOptions = {})
     }
     // Only subqueries of the FROM clause have a name (which is the alias)
     // TODO Discuss: a query does not have a name.id anymore
-    const queryAlias = query._parent; // parent could also be outer query, or main entity
-    if(query.op.val === 'SELECT' && query.name.id && queryAlias && queryAlias.kind === '$tableAlias')
-    {
-      query.name.id = queryAlias._parent.$tableAliases[query.name.id].$QA.name.id;
-    }
+    // const queryAlias = query._parent; // parent could also be outer query, or main entity
+    // if(query.op.val === 'SELECT' && query.name.id && queryAlias && queryAlias.kind === '$tableAlias')
+    // {
+    //   query.name.id = queryAlias._parent.$tableAliases[query.name.id].$QA.name.id;
+    // }
   }
 
   /*
@@ -430,7 +432,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         if(art.kind === 'entity')
         {
           if(!childQat.$QA)
-            childQat.$QA = createQA(env, art, art.name.absolute.split('.').pop(), childQat._namedArgs);
+            childQat.$QA = createQA(env, art, art.name.id.split('.').pop(), childQat._namedArgs);
           incAliasCount(env, childQat.$QA);
           newAssocLHS = childQat.$QA;
 
@@ -529,7 +531,7 @@ function translateAssocsToJoins(model, inputOptions = {})
       const xsnCard = {
         targetMax : { literal: 'number', val: 1 }
       };
-      if(assoc.type._artifact._effectiveType.name.absolute === 'cds.Composition') {
+      if(assoc.type._artifact._effectiveType.name.id === 'cds.Composition') {
         xsnCard.sourceMin = { literal: 'number', val: 1 };
         xsnCard.sourceMax = { literal: 'number', val: 1 };
       }
@@ -658,7 +660,7 @@ function translateAssocsToJoins(model, inputOptions = {})
       // clone ON condition with rewritten paths and substituted backlink conditions
       function cloneOnCondition(expr)
       {
-        if(expr.op && expr.op.val === 'xpr')
+        if(expr.op?.val === 'xpr')
           return cloneOnCondExprStream(expr);
         else
           return cloneOnCondExprTree(expr);
@@ -669,7 +671,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         const result = { op: { val: expr.op.val }, args: [ ] };
         for(let i = 0; i < args.length; i++)
         {
-          if(args[i].op && args[i].op.val === 'xpr')
+          if(args[i].op?.val === 'xpr')
           {
             result.args.push(cloneOnCondition(args[i]));
           }
@@ -696,11 +698,11 @@ function translateAssocsToJoins(model, inputOptions = {})
               i += 2; // skip next two tokens and continue with loop
               continue;
             }
-            else
+            else // it's ensured that it's a path
               result.args.push(rewritePathNode(args[i]));
           }
-          else
-            result.args.push(rewritePathNode(args[i]));
+          else // could be `{op:…}`, clone generically
+            result.args.push(cloneOnCondition(args[i]));
         }
         return result;
       }
@@ -731,7 +733,8 @@ function translateAssocsToJoins(model, inputOptions = {})
         // this will substitute multiple backlink conditions ($self = ... AND $self = ...AND ...)
         if(expr.op) {
           let x = clone(expr);
-          x.args = expr.args.map(cloneOnCondition);
+          if(expr.args)
+            x.args = expr.args.map(cloneOnCondition);
           return x;
         }
 
@@ -931,8 +934,8 @@ function translateAssocsToJoins(model, inputOptions = {})
 
               if(elt) {
                 if(Array.isArray(elt)) {
-                  const names = elt.map(e => e._origin.name.absolute);
-                  error(null, [ assocQAT._origin.location, assocQAT._origin ], { elemref: path[0].id, id: assoc.name.id, art: assoc.name.absolute, names },
+                  const names = elt.map(e => (e._origin._main || e._origin).name.id);
+                  error(null, [ assocQAT._origin.location, assocQAT._origin ], { elemref: path[0].id, id: assoc.name.id, art: assoc._main, names },
                     'Element $(ELEMREF) referred in association $(ID) of artifact $(ART) is available from multiple query sources $(NAMES)');
                   return pathNode.path;
                 } else {
@@ -940,16 +943,16 @@ function translateAssocsToJoins(model, inputOptions = {})
                   if(elt._origin._main !== path[0]._artifact._origin._main) {
                     warning(null, [ assocQAT._origin.location, assocQAT._origin ], {
                       elemref: path[0].id,
-                      id: assoc.name.id, art: assoc.name.absolute,
-                      name: path[0]._artifact._origin._main.name.absolute,
-                      alias: elt._origin._main.name.absolute,
-                      source: elt._main.name.absolute,
+                      id: assoc.name.id, art: assoc._main.name.id,
+                      name: path[0]._artifact._origin._main.name.id,
+                      alias: elt._origin._main.name.id,
+                      source: elt._main.name.id,
                     }, 'Element $(ELEMREF) referred in association $(ID) of artifact $(ART) originates from $(NAME) and from $(ALIAS) in $(SOURCE)');
                   }
                   _navigation = elt._parent;
                 }
               } else {
-                error(null, [ assocQAT._origin.location, assocQAT._origin ], { elemref: path[0].id, id: assoc.name.id, art: assoc.name.absolute },
+                error(null, [ assocQAT._origin.location, assocQAT._origin ], { elemref: path[0].id, id: assoc.name.id, art: (assoc._main || assoc) },
                   'Element $(ELEMREF) referred in association $(ID) of artifact $(ART) has not been found');
                 return pathNode.path;
               }
@@ -1020,7 +1023,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     }
 
     const pathStep = {
-      id: artifact.name.absolute,
+      id: (artifact._main || artifact).name.id,
       _artifact: artifact,
       _navigation : { name: { select: env.queryIndex + 1 } } // ???
     };
@@ -1320,20 +1323,20 @@ function translateAssocsToJoins(model, inputOptions = {})
       /* checks for all path steps */
       if(ps.args) {
         error(null, [pathDict.location, lead],
-          { name: lead.name.absolute, id: ps.id },
-          '$(NAME): $(ID) must not have parameters');
+          { art: lead._main || lead, id: ps.id },
+          '$(ART): $(ID) must not have parameters');
         pathDict.$check = false;
       }
       if(ps.where) {
         error(null, [pathDict.location, lead],
-          { name: lead.name.absolute, id: ps.id },
-          '$(NAME): $(ID) must not have a filter');
+          { art: lead._main || lead, id: ps.id },
+          '$(ART): $(ID) must not have a filter');
         pathDict.$check = false;
       }
       if(ps._artifact.virtual) {
         error(null, [pathDict.location, lead],
-          { name: lead.name.absolute, id: ps.id },
-          '$(NAME): $(ID) must not be virtual');
+          { art: lead._main || lead, id: ps.id },
+          '$(ART): $(ID) must not be virtual');
         pathDict.$check = false;
       }
       // checks for all path steps except the first one (if it is the name of the defining association)
@@ -1345,15 +1348,15 @@ function translateAssocsToJoins(model, inputOptions = {})
           if(ps._artifact.on)
           {
             error(null, [pathDict.location, lead],
-              { name: lead.name.absolute, id: ps.id, alias: pathAsStr(pathDict.path) },
-              '$(NAME): $(ID) in path $(ALIAS)" must not be an unmanaged association');
+              { art: lead._main || lead, id: ps.id, alias: pathAsStr(pathDict.path) },
+              '$(ART): $(ID) in path $(ALIAS) must not be an unmanaged association');
             pathDict.$check = false;
           }
           else if(ps._artifact.$fkPathPrefixTree)// must be managed
           {
             if(!ps._artifact.$fkPathPrefixTree.children[la1.id]) {
               error(null, [pathDict.location, lead],
-                { art: lead.name.absolute, id: la1.id, name: ps.id, alias: pathAsStr(pathDict.path) },
+                { art: lead._main || lead, id: la1.id, name: ps.id, alias: pathAsStr(pathDict.path) },
                 '$(ART): $(ID) is not foreign key of managed association $(NAME) in path $(ALIAS)' );
               pathDict.$check = false;
             }
@@ -1362,7 +1365,7 @@ function translateAssocsToJoins(model, inputOptions = {})
         else {
           // it is the last path step => no association
           error(null, [pathDict.location, lead],
-            { art: lead.name.absolute, id: ps.id, alias: pathAsStr(pathDict.path) },
+            { art: lead._main || lead, id: ps.id, alias: pathAsStr(pathDict.path) },
             '$(ART): $(ID) in path $(ALIAS) must not be an association');
           pathDict.$check = false;
         }
@@ -1373,7 +1376,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     const artifact = lastSegment && lastSegment._artifact && lastSegment._artifact.type && lastSegment._artifact.type._artifact && lastSegment._artifact.type._artifact;
     if (artifact && artifact.elements) {
       error(null, [pathDict.location, lead],
-        { art: lead.name.absolute, id: lastSegment.id },
+        { art: lead._main || lead, id: lastSegment.id },
         '$(ART): $(ID) must have scalar type');
       pathDict.$check = false;
     }
@@ -1547,10 +1550,11 @@ function translateAssocsToJoins(model, inputOptions = {})
       */
       const art = qat._origin;
       if(noJoinForFK && qat._origin.target) {
-        if(!pathStep.where && // has no filter
-          !pathStep.args && // has no args
+        if(!pathStep.args && // has no args
           (
-            (  // not leaf
+            (
+              !pathStep.where && // has no filter
+              // not leaf + next step is foreign key
               i < tail.length-1 &&
               // path terminates on a scalar type
               // _effectiveType.elements can be removed if forRelationalDB can expand fk paths correctly
@@ -1562,7 +1566,8 @@ function translateAssocsToJoins(model, inputOptions = {})
             )
           ||
             (
-              // Non from block path terminates on association
+              // Non-FROM block path terminates on association, e.g. publishing associations
+              // with or without filter.
               i === tail.length-1 &&
               env.location !== 'from'
             )

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -96,7 +96,7 @@ module.exports = (csn, options) => {
     val: always,
     type: notWithItemsOrElements,
     target: notWithItemsOrElements,
-    keys: notWithItemsOrElements,
+    keys: specialKeysRules,
     cardinality: notWithItemsOrElements,
   };
 
@@ -747,6 +747,22 @@ function specialItemsRules( prop, target, source ) {
     target[prop] = source[prop];
 }
 
+/**
+ * Don't propagate property `keys` if there is an ON-condition.  This happens for
+ * published managed associations with filters in views, which are transformed into
+ * unmanaged associations, i.e. get an ON-condition.
+ *
+ * Besides that, rules from notWithItemsOrElements() apply.
+ *
+ * @param {string} prop
+ * @param {CSN.Element} target
+ * @param {CSN.Element} source
+ */
+function specialKeysRules( prop, target, source ) {
+  if (target.on === undefined)
+    notWithItemsOrElements( prop, target, source );
+}
+
 /**
  * Don't propagate certain properties if the target already has a .items or .elements
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "4.2.4",
+  "version": "4.3.2",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -38,7 +38,6 @@
     "generateOdataAnnoRefs": "cross-env MAKEREFS='true' mocha test/testODataAnnotations.js",
     "generateToSqlRefs": "cross-env MAKEREFS='true' mocha test/testToSql.js",
     "generateToRenameRefs": "cross-env MAKEREFS='true' mocha test/testToRename.js",
-    "generateChecksRefs": "cross-env MAKEREFS='true' mocha test/testChecks.js",
     "generateDraftRefs": "cross-env MAKEREFS='true' mocha test/testDraft.js",
     "generateAllRefs": "node scripts/verifyGrammarChecksum.js && cross-env MAKEREFS='true' mocha --reporter-option maxDiffSize=0 test/ test3/"
   },