@sap/cds-compiler 4.9.2 → 4.9.6

package/CHANGELOG.md

@@ -7,6 +7,23 @@
 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.9.6 - 2024-07-15
+
+### Fixed
+
+- for.seal: Don't generate DRAFT artifacts.
+- for.odata: Propagate all `@odata { Type, MaxLength, Precision, Scale, SRID }` to generated foreign keys.
+- to.edm(x): Respect `AppliesTo` specification in term definitions for actions and functions.
+- to.sql: Conditions inside filters in combination with foreign key aliases were not properly translated in rare cases.
+
+## Version 4.9.4 - 2024-05-21
+
+### Fixed
+
+- to.sql:
+  + always include `tenant` column in foreign key references.
+  + reject `tenantDiscriminator` option only if sql dialect is `hana` and if  `withHanaAssociations` option is set.
+
 ## Version 4.9.2 - 2024-05-13
 
 ### Fixed

package/lib/api/main.js

@@ -1293,7 +1293,7 @@ function lazyload( moduleName ) {
  * @param {object} messageFunctions Message functions
  */
 function handleTenantDiscriminator( options, internalOptions, messageFunctions ) {
-  if (options.tenantDiscriminator && options.withHanaAssociations) {
+  if (options.tenantDiscriminator && options.withHanaAssociations && internalOptions.sqlDialect === 'hana') {
     messageFunctions.error('api-invalid-combination', null, {
       option: 'tenantDiscriminator',
       prop: 'withHanaAssociations',

package/lib/api/options.js

@@ -172,6 +172,7 @@ module.exports = {
     },
     hdi: (options) => {
       const hardOptions = { src: 'hdi', toSql: true, forHana: true };
+      // TODO: sqlDialect should be a hard option!
       const defaultOptions = {
         sqlMapping: 'plain', sqlDialect: 'hana', generatedByComment: false, withHanaAssociations: true,
       };
@@ -179,6 +180,7 @@ module.exports = {
     },
     hdbcds: (options) => {
       const hardOptions = { forHana: true };
+      // TODO: sqlDialect should be a hard option!
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana' };
       return translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdbcds');
     },

package/lib/edm/annotations/genericTranslation.js

@@ -261,6 +261,7 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
     const entityName = nameParts.pop();
 
     Object.entries(cObject.actions).forEach(([ n, action ]) => {
+      setProp(action, '$isBound', true);
       const actionName = `${serviceName}.${isV2() ? `${entityName}_` : ''}${n}`;
       handleAction(actionName, action, cObjectname, [ ...location, 'actions', n ]);
     });
@@ -516,13 +517,14 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
       if (carrier.kind === 'entity') {
       // If AppliesTo=[EntitySet/Singleton/Collection, EntityType], EntitySet/Singleton/Collection has precedence
         testToAlternativeEdmTargetP = ((x) => {
-          if (options.isV2())
-            return [ 'Singleton', 'EntitySet', 'Collection' ].some(y => x.includes(y));
-
-
-          return edmUtils.isSingleton(carrier)
-            ? x.includes('Singleton')
-            : [ 'EntitySet', 'Collection' ].some(y => x.includes(y));
+          if (x) {
+            if (options.isV2())
+              return [ 'Singleton', 'EntitySet', 'Collection' ].some(y => x.includes(y));
+            return edmUtils.isSingleton(carrier)
+              ? x.includes('Singleton')
+              : [ 'EntitySet', 'Collection' ].some(y => x.includes(y));
+          }
+          return true;
         });
         testToStandardEdmTargetP = (x => (x ? x.includes('EntityType') : true));
         // if carrier has an alternate 'entitySetName' use this instead of EdmTargetName
@@ -540,6 +542,23 @@ function csn2annotationEdm( reqDefs, reqDefsUtils, csnVocabularies, serviceName,
       else if (carrier.kind === 'type') {
         testToStandardEdmTargetP = (x => (x ? x.includes(carrier.elements ? 'ComplexType' : 'TypeDefinition') : true));
       }
+      else if (carrier.kind === 'action' || carrier.kind === 'function') {
+        const type = carrier.kind === 'action' ? 'Action' : 'Function';
+        const container = carrier.kind === 'action' ? 'ActionImport' : 'FunctionImport';
+        if (options.isV4()) {
+          testToStandardEdmTargetP = (x => (x ? x.includes(type) : true));
+          // Unbound actions/functions are Action/FunctionImports and are bound to container target
+          testToAlternativeEdmTargetP = (x => (x ? x.includes(container) && !carrier.$isBound : true));
+          const lastDotIndex = carrier.name.lastIndexOf('.');
+          alternativeEdmTargetNameP = lastDotIndex > -1
+            ? `${serviceName}.EntityContainer/${carrier.name.substring(lastDotIndex + 1)}`
+            : `${serviceName}.EntityContainer/${carrier.name}`;
+          hasAlternativeCarrierP = true;
+        }
+        if (options.isV2())
+          // same as in V4 but everything goes to standard target
+          testToStandardEdmTargetP = (x => (x ? x.includes(type) || (x.includes(container) && !carrier.$isBound) : true));
+      }
       else if (carrier.kind === 'service') {
       // if annotated object is a service, annotation goes to EntityContainer,
       //   except if AppliesTo contains Schema but not EntityContainer, then annotation goes to Schema

package/lib/transform/db/constraints.js

@@ -203,28 +203,28 @@ function createReferentialConstraints( csn, options ) {
       // in contrast to foreign keys which stem from managed associations,
       // a tenant foreign key column may have multiple parent keys as partners
       const tenantForeignKey = isTenant && dependentKeyValuePair[0] === 'tenant';
-      if ($foreignKeyConstraint && (!tenantForeignKey || $foreignKeyConstraint.upLinkFor)) {
+      if ($foreignKeyConstraint && (!tenantForeignKey || $foreignKeyConstraint.upLinkFor))
         return;
-      }
-      else if ($foreignKeyConstraint && tenantForeignKey) {
-        parentKeys.pop();
-        $foreignKeyConstraint.sourceAssociation.push(sourceAssociation);
+
+      const parentKeyValuePair = parentKeys.pop();
+      const parentKeyName = parentKeyValuePair[0];
+
+      const constraint = {
+        parentKey: parentKeyName,
+        parentTable,
+        upLinkFor,
+        sourceAssociation,
+        onDelete: upLinkFor ? 'CASCADE' : 'RESTRICT',
+        validated,
+        enforced,
+      };
+      if (tenantForeignKey) {
+        const dontOverwriteUp = dependentKey.$foreignKeyConstraint && dependentKey.$foreignKeyConstraint.some(c => c.sourceAssociation === sourceAssociation && c.parentTable === parentTable);
+        const dontOverwriteTexts = dependentKey.$foreignKeyConstraint && dependentKey.$foreignKeyConstraint.some(c => c.sourceAssociation === 'texts' && c.upLinkFor.texts);
+        if (!dontOverwriteUp && !dontOverwriteTexts)
+          dependentKey.$foreignKeyConstraint = dependentKey.$foreignKeyConstraint ? [ ...dependentKey.$foreignKeyConstraint, constraint ] : [ constraint ];
       }
       else {
-        const parentKeyValuePair = parentKeys.pop();
-        const parentKeyName = parentKeyValuePair[0];
-
-        const constraint = {
-          parentKey: parentKeyName,
-          parentTable,
-          upLinkFor,
-          sourceAssociation: tenantForeignKey
-            ? [ sourceAssociation ]
-            : sourceAssociation,
-          onDelete: upLinkFor ? 'CASCADE' : 'RESTRICT',
-          validated,
-          enforced,
-        };
         dependentKey.$foreignKeyConstraint = constraint;
       }
     }
@@ -509,13 +509,11 @@ function createReferentialConstraints( csn, options ) {
     if (isTenant && artifact.elements?.tenant) {
       const element = artifact.elements.tenant;
       if (element.$foreignKeyConstraint) {
-        const $foreignKeyConstraint = Object.assign({}, element.$foreignKeyConstraint);
+        const tenantConstraints = element.$foreignKeyConstraint;
         delete element.$foreignKeyConstraint;
-        // create a foreign key constraint for the tenant column with each association in the dependent entity
-        $foreignKeyConstraint.sourceAssociation.forEach((sourceAssociation) => {
-          const copy = Object.assign({}, $foreignKeyConstraint);
-          copy.sourceAssociation = sourceAssociation;
-          createReferentialConstraints(copy, 'tenant');
+        // create (multiple) foreign key constraint(s) for the tenant column with each association in the dependent entity
+        tenantConstraints.forEach((c) => {
+          createReferentialConstraints(c, 'tenant');
         });
       }
     }

package/lib/transform/db/flattening.js

@@ -16,6 +16,7 @@ const { setProp, isBetaEnabled } = require('../../base/model');
 const { forEach } = require('../../utils/objectUtils');
 const { transformExpression } = require('./applyTransformations');
 const { cloneCsnNonDict } = require('../../model/cloneCsn');
+const { EdmTypeFacetNames } = require('../../edm/EdmPrimitiveTypeDefinitions');
 
 /**
  * Strip off leading $self from refs where applicable.
@@ -828,11 +829,11 @@ function createForeignKeys( csnUtils, path, element, prefix, csn, options, pathD
   else if (finalElement.type == null || isBuiltinType(finalElement.type)) {
     const newFk = Object.create(null);
     setProp(newFk, '$extensionPath', extensionPath);
-    for (const prop of [ 'type', 'length', 'scale', 'precision', 'srid', 'default', '@odata.Type' ]) {
+    [ 'type', 'length', 'scale', 'precision', 'srid', 'default', '@odata.Type', ...EdmTypeFacetNames.map(f => `@odata.${f}`) ].forEach((prop) => {
       // copy props from original element to preserve derived types!
       if (element[prop] !== undefined)
         newFk[prop] = element[prop];
-    }
+    });
     return [ [ prefix, newFk ] ];
   }
 

package/lib/transform/effective/main.js

@@ -11,7 +11,6 @@ const validate = require('../../checks/validator');
 const expansion = require('../db/expansion');
 const queries = require('./queries');
 const associations = require('./associations');
-const generateDrafts = require('../draft/db');
 const handleExists = require('../db/transformExists');
 const misc = require('./misc');
 const annotations = require('./annotations');
@@ -77,7 +76,6 @@ function effectiveCsn( model, options, messageFunctions ) {
   processCalculatedElementsInEntities(csn);
   associations.managedToUnmanaged(csn, options, csnUtils, messageFunctions);
   associations.transformBacklinks(csn, options, csnUtils, messageFunctions);
-  generateDrafts(csn, options, '_', messageFunctions);
   const transformers = mergeTransformers([ misc.attachPersistenceName(csn, options, csnUtils), options.remapOdataAnnotations ? annotations.remapODataAnnotations(csn) : {}, misc.removeDefinitionsAndProperties(csn, options) ], null);
   applyTransformations(csn, transformers, [], { skipIgnore: false });
 

package/lib/transform/translateAssocsToJoins.js

@@ -1110,8 +1110,27 @@ function translateAssocsToJoins(model, inputOptions = {})
             }
             else {
               const [ tableAlias, path ] = getTableAliasAndPathSteps(pathNode);
-              const pathStr = path.map(ps => ps.id).join(pathDelimiter);
-              replaceNodeContent(pathNode, constructPathNode([ tableAlias, { id: pathStr, _artifact: pathNode._artifact } ]));
+              const rewrittenPath = [];
+              const leafArtifact = path.at(-1)._artifact;
+              // Walk from left to right and search for first assoc. If assocs in filters become join relevant in the future,
+              // i.e. not only fk-access, we need to revisit this
+              for(let i = 0; i < path.length; i++) {
+                const pathStep = path[i];
+                if(pathStep._artifact?.foreignKeys) {
+                  const possibleNonAliasedFkName = path.slice(i).map(ps => ps.id).join(pathDelimiter);
+                  if(!pathStep._artifact.$flatSrcFKs)
+                      setProp(pathStep._artifact, '$flatSrcFKs', flattenElement(pathStep._artifact, true, pathStep._artifact.name.id, pathStep._artifact.name.id));
+                  const fk = pathStep._artifact.$flatSrcFKs.find(f => f._artifact === leafArtifact && f.acc.startsWith(possibleNonAliasedFkName));
+                  if(fk) {
+                    rewrittenPath.push(fk);
+                    i = path.length;
+                    continue;
+                  }
+                }
+
+                rewrittenPath.push(pathStep);
+              }
+              replaceNodeContent(pathNode, constructPathNode([ tableAlias, { id: rewrittenPath.map(ps => ps.id).join(pathDelimiter), _artifact: pathNode._artifact } ]));
             }
           }
         } ]

package/package.json

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