@sap/cds-compiler 4.9.2 → 4.9.4

package/CHANGELOG.md

@@ -7,6 +7,14 @@
 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.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/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/package.json

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