@sap/cds-compiler 4.4.4 → 4.6.0

package/lib/transform/translateAssocsToJoins.js

@@ -47,8 +47,6 @@ function translateAssocsToJoinsCSN(csn, options){
     deduplicateMessages( options.messages );
   }
 
-  // If A2J reports error - end! Continuing with a broken CSN makes no sense
-  makeMessageFunction(model, options).throwWithAnyError();
   // FIXME: Move this somewhere more appropriate
   const newCsn = compactModel(model, compileOptions);
   //require('fs').writeFileSync('./csnoutput_a2j.json', JSON.stringify(newCsn, null,2))
@@ -57,7 +55,7 @@ function translateAssocsToJoinsCSN(csn, options){
 
 function translateAssocsToJoins(model, inputOptions = {})
 {
-  const { error, warning } = makeMessageFunction(model, inputOptions);
+  const { error, warning, throwWithError } = makeMessageFunction(model, inputOptions);
 
   const options = model.options || inputOptions;
 
@@ -70,6 +68,9 @@ function translateAssocsToJoins(model, inputOptions = {})
   forEachDefinition(model, prepareAssociations);
   forEachDefinition(model, transformQueries);
 
+  // If A2J reports error - end! Continuing with a broken model makes no sense
+  throwWithError();
+
   return model;
 
   function prepareAssociations(art)
@@ -263,8 +264,12 @@ function translateAssocsToJoins(model, inputOptions = {})
   /*
     Substitute $self/$projection expression with its value
   */
-  function substituteDollarSelf(pathNode)
+  function substituteDollarSelf(pathNode, env)
   {
+    // do not substitute $self values for outer order by clauses
+    if (env?.location === 'UnionOuterOrderBy')
+      return;
+
     let pathValue = pathNode;
     let [head, ...tail] = pathValue.path;
     while(tail.length && head._navigation?.kind === '$self') {
@@ -311,12 +316,14 @@ function translateAssocsToJoins(model, inputOptions = {})
     {
       // Paths without _navigation in ORDER BY are select item aliases, they must
       // be rendered verbatim
-      if((env.location === 'OrderBy' && !pathNode.path[0]._navigation))
+      let [head, ...tail] = pathNode.path;
+      if((env.location === 'OrderBy' && !head._navigation)||
+         env.location === 'UnionOuterOrderBy' && (!head._navigation || ['$self', '$projection'].includes(head.id)))
         return;
 
       // path outside ON cond:
       // spin the crystal ball to identify the correct table alias
-      let [head, ...tail] = pathNode.path;
+
       // pop ta ps
       if(head._navigation.kind !== '$tableAlias')
         tail = pathNode.path;
@@ -488,7 +495,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     let srcTableAlias = constructTableAliasPathStep(assocSourceQA);
     let tgtTableAlias = constructTableAliasPathStep(assocQAT.$QA);
 
-    node.on = createOnCondition(assoc, srcTableAlias, tgtTableAlias);
+    node.on = createOnCondition(assoc, srcTableAlias, tgtTableAlias, options.tenantAsColumn);
 
     if(assocQAT._filter)
     {
@@ -558,7 +565,7 @@ function translateAssocsToJoins(model, inputOptions = {})
       return xsnCard;
     }
     // produce the ON condition for a given association
-    function createOnCondition(assoc, srcAlias, tgtAlias)
+    function createOnCondition(assoc, srcAlias, tgtAlias, compareTenants)
     {
       let prefixes = [ assoc.name.id ];
       /* This is no art and can be removed once ON cond for published
@@ -593,7 +600,7 @@ function translateAssocsToJoins(model, inputOptions = {})
           Put all src/tgt path siblings into the EQ term and create the proper path objects
           with the src/tgt table alias path steps in front.
         */
-        let args = [];
+        let args = [];          // TODO: tenant comparison?
         for(let i = 0; i < assoc.$flatSrcFKs.length; i++)
         {
           args.push({op: {val: '=' },
@@ -654,7 +661,25 @@ function translateAssocsToJoins(model, inputOptions = {})
         env.assocStack.push(assoc);
         const onCond = cloneOnCondition(assoc.on);
         env.assocStack.pop();
-        return onCond;
+        return compareTenants ? addTenantComparison(assoc, onCond) : onCond;
+      }
+
+      // Add tenant comparison
+      function addTenantComparison(assoc, cond) {
+        // It is enough to test whether the target is tenant-dependent.  If it is,
+        // the current query must also be (check in addTenantFields).  If we allow
+        // assocs from tenant-independent entities to tenant-dependent ones, we
+        // also need to use the current query = `env.lead`.
+        if(annotationVal(assoc.target._artifact['@cds.tenant.independent']))
+          return cond;
+
+        const args = [ constructPathNode([ srcAlias ]), constructPathNode([ tgtAlias ]) ];
+        args[0].path.push({ id: 'tenant' }); // no need for _artifact
+        args[1].path.push({ id: 'tenant' }); // no need for _artifact
+        const comparison = { op: {val: '=' }, args };
+        if (!cond)              // for managed assoc
+          return comparison;
+        return { op: { val: 'and' }, args: [ comparison, parenthesise(cond) ] };
       }
 
       // make foreign key absolute to its main entity
@@ -1041,6 +1066,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     return node;
   }
 
+  // Remark CW: why boolean and not just truthy/falsy as usual?  See annotationVal() below
   function isBooleanAnnotation(prop, val=true) {
     return prop && prop.val !== undefined && prop.val === val && prop.literal === 'boolean';
   }
@@ -1438,7 +1464,7 @@ function translateAssocsToJoins(model, inputOptions = {})
     {
       // speciality for OrderBy: If path has no _navigation don't merge it.
       // Path is alias to select item expression
-      if(env.location === 'OrderBy')
+      if(['OrderBy', 'UnionOuterOrderBy'].includes(env.location))
         return;
 
       // env.pathStep is set in walkPath for walk on filter conditions
@@ -1769,6 +1795,9 @@ function walkQuery(query, env)
       walk(query.having, env);
       env.location = 'OrderBy';
       walk(query.orderBy, env);
+      env.location = 'UnionOuterOrderBy';
+      // outer orderBy's of anonymous union
+      walk(query.$orderBy, env);
       if(query.limit) {
         env.location = 'Limit';
         walk(query.limit.rows, env);
@@ -1896,4 +1925,9 @@ function walkPath(node, env)
   return path;
 }
 
+function annotationVal( anno ) {
+  // XSN TODO: also set `val:true` but no location for anno short form
+  return anno && (anno.val === undefined || anno.val);
+}
+
 module.exports = { translateAssocsToJoinsCSN };

package/lib/transform/universalCsn/coreComputed.js

@@ -157,7 +157,7 @@ function setCoreComputedOnViewsAndCalculatedElements( csn, csnUtils ) {
         (
           column.xpr || column.list || column.func || column.val !== undefined || column['#'] !== undefined || column.param ||
           column.SELECT || column.SET ||
-          column.ref && [ '$at', '$valid', '$now', '$user', '$session', '$parameters' ].includes(column.ref[0])
+          column.ref && [ '$at', '$valid', '$now', '$user', '$tenant', '$session', '$parameters' ].includes(column.ref[0])
         );
     }
 

package/lib/transform/universalCsn/universalCsnEnricher.js

@@ -328,9 +328,9 @@ module.exports = (csn, options) => {
      * passed to this function.
      *
      * @param {CSN.Element}  member
-     * @param {object}       [except=null] List of properties which should not be propagated along the origin chain
+     * @param {object}       [except] List of properties which should not be propagated along the origin chain
      *                                     of the `member`
-     * @param {object}       [force=null]  Overwrite any member propagation rules or any except and always propagate the corresponding keys
+     * @param {object}       [force]  Overwrite any member propagation rules or any except and always propagate the corresponding keys
      */
     function propagateMemberPropsFromOrigin( member, except = null, force = null ) {
       const memberChain = getOriginChain(member);
@@ -613,8 +613,8 @@ module.exports = (csn, options) => {
  * @param {object} to
  * @param {Function} getCustomRule getter for the `memberProps` or `defProps`
  *                                 which shall be used for retrieving custom rules
- * @param {object} [except=null] array of properties which should not be propagated
- * @param {object} [force=null] Force propagation of the contained keys via a custom rule.
+ * @param {object} [except] array of properties which should not be propagated
+ * @param {object} [force] Force propagation of the contained keys via a custom rule.
  */
 function copyProperties( from, to, getCustomRule, except = null, force = null ) {
   const keys = Object.keys(from);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-compiler",
-  "version": "4.4.4",
+  "version": "4.6.0",
   "description": "CDS (Core Data Services) compiler and backends",
   "homepage": "https://cap.cloud.sap/",
   "author": "SAP SE (https://www.sap.com)",
@@ -18,15 +18,16 @@
     "gen": "node ./scripts/build.js && node scripts/genGrammarChecksum.js",
     "xmakeAfterInstall": "npm run gen",
     "xmakePrepareRelease": "echo \"$(node scripts/stripReadme.js README.md)\" > README.md && node scripts/assertSnapshotVersioning.js && node scripts/assertChangelog.js && node scripts/cleanup.js --remove-dev",
-    "test": "node scripts/verifyGrammarChecksum.js && mocha --reporter min --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter min --reporter-option maxDiffSize=0 test/ test3/",
-    "testci": "node scripts/verifyGrammarChecksum.js && mocha --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter-option maxDiffSize=0 test/ test3/",
-    "testverbose": "node scripts/verifyGrammarChecksum.js && mocha --parallel test/ test3/",
+    "test": "npm run test:piper",
+    "test:ci": "node scripts/verifyGrammarChecksum.js && mocha --timeout 10000 --reporter-option maxDiffSize=0 scripts/testLazyLoading.js && mocha --parallel --reporter-option maxDiffSize=0 test/ test3/",
+    "test:piper": "node scripts/verifyGrammarChecksum.js && npm run coverage:piper",
     "test3": "node scripts/verifyGrammarChecksum.js && mocha --reporter-option maxDiffSize=0 test3/",
     "deployHanaSql": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.hana-sql.js",
     "deployHdiHdbcds": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.hdi.hdbcds.js",
     "deployGitDiffs": "CDS_COMPILER_DEPLOY_HANA=1 mocha --reporter-option maxDiffSize=0 test3/test.deploy.git-diffs.js",
     "gentest3": "cross-env MAKEREFS=${MAKEREFS:-'true'} mocha --reporter-option maxDiffSize=0 test3/testRefFiles.js",
-    "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/ && nyc report --reporter=lcov",
+    "coverage": "cross-env nyc mocha --reporter-option maxDiffSize=0 test/ test3/testRefFiles.js && nyc report --reporter=lcov",
+    "coverage:piper": "cross-env nyc mocha --reporter test/TestMochaReporter.js --reporter-options mochaFile=./coverage/TEST-results.xml --reporter-option maxDiffSize=0 --timeout 10000 test/ test3/ && nyc report --reporter=cobertura && nyc report --reporter=lcov",
     "lint": "eslint bin/ benchmark/ lib/ test/ test3/ scripts/ types/ && node scripts/linter/lintGrammar.js && node scripts/linter/lintTests.js test3/ && node scripts/linter/lintMessages.js && node scripts/linter/lintMessageIdCoverage.js lib/ && markdownlint README.md CHANGELOG.md doc/ internalDoc/ && cd share/messages && markdownlint .",
     "tslint": "tsc --pretty -p .",
     "updateVocs": "node scripts/odataAnnotations/generateDictMain.js && npm run generateAllRefs",
@@ -40,7 +41,7 @@
     "generateToSqlRefs": "cross-env MAKEREFS='true' mocha test/testToSql.js",
     "generateToRenameRefs": "cross-env MAKEREFS='true' mocha test/testToRename.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/"
+    "generateAllRefs": "node scripts/verifyGrammarChecksum.js && cross-env MAKEREFS=force mocha --reporter-option maxDiffSize=0 test/ test3/"
   },
   "keywords": [
     "CDS"