@sap/cds-compiler 4.7.6 → 4.9.0

package/lib/modelCompare/compare.js

@@ -1,17 +1,24 @@
 'use strict';
 
 const { makeMessageFunction } = require('../base/messages');
+const { setProp } = require('../base/model');
 const {
   forEachDefinition,
   forEachMember,
   isPersistedAsTable,
-  isPersistedAsView
+  isPersistedAsView,
 } = require('../model/csnUtils');
 const { forEachKey, forEach } = require('../utils/objectUtils');
 
 // used to mark a view as changed so we know to drop-create it
 const isChanged = Symbol('Marks a view as changed');
 
+const relevantProperties = {
+  doc: true,
+  '@sql.prepend': true,
+  '@sql.append': true,
+};
+
 /**
  * Compares two models, in HANA-transformed CSN format, to each other.
  *
@@ -23,7 +30,7 @@ const isChanged = Symbol('Marks a view as changed');
  */
 function compareModels(beforeModel, afterModel, options) {
   // @ts-ignore
-  if(!(options && options.testMode)) // no $version with testMode
+  if (!(options && options.testMode)) // no $version with testMode
     validateCsnVersions(beforeModel, afterModel, options);
 
   const returnObj = Object.create(null);
@@ -45,8 +52,8 @@ function compareModels(beforeModel, afterModel, options) {
 function validateCsnVersions(beforeModel, afterModel, options) {
   const beforeVersion = beforeModel.$version;
   const afterVersion = afterModel.$version;
-  let beforeVersionParts = beforeVersion && beforeVersion.split('.');
-  let afterVersionParts = afterVersion && afterVersion.split('.');
+  const beforeVersionParts = beforeVersion && beforeVersion.split('.');
+  const afterVersionParts = afterVersion && afterVersion.split('.');
 
   if (!beforeVersionParts || beforeVersionParts.length < 2) {
     const { error, throwWithAnyError } = makeMessageFunction(beforeModel, options, 'modelCompare');
@@ -60,53 +67,85 @@ function validateCsnVersions(beforeModel, afterModel, options) {
   }
   if (beforeVersionParts[0] > afterVersionParts[0] && !(options && options.allowCsnDowngrade)) {
     const { error, throwWithAnyError } = makeMessageFunction(afterModel, options, 'modelCompare');
-    error(null, null, { value: afterVersion, othervalue: beforeVersion, version: require('../../package.json').version },
-      'Incompatible CSN versions: $(VALUE) is a major downgrade from $(OTHERVALUE). Is @sap/cds-compiler version $(VERSION) outdated?');
+    // eslint-disable-next-line global-require
+    const { version } = require('../../package.json');
+    error(null, null, { value: afterVersion, othervalue: beforeVersion, version },
+          'Incompatible CSN versions: $(VALUE) is a major downgrade from $(OTHERVALUE). Is @sap/cds-compiler version $(VERSION) outdated?');
     throwWithAnyError();
   }
 }
 
 /**
  * Calculate extensions, migrations and unchangedConstraints
- * 
- * @param {CSN.Model} beforeModel 
- * @param {CSN.Options} options 
- * @param {object} returnObj 
+ *
+ * @param {CSN.Model} beforeModel
+ * @param {CSN.Options} options
+ * @param {object} returnObj
  * @returns {function}
  */
-function getExtensionAndMigrations(beforeModel, options, { extensions, migrations, unchangedConstraints, changedPrimaryKeys }) {
+function getExtensionAndMigrations(beforeModel, options, {
+  extensions, migrations, unchangedConstraints, changedPrimaryKeys,
+}) {
   return function compareArtifacts(artifact, name) {
     let hasPrimaryKeyChange = false;
+    const otherArtifact = beforeModel.definitions[name];
+    const isPersisted = isPersistedAsTable(artifact);
+    const isPersistedOther = otherArtifact && isPersistedAsTable(otherArtifact);
+
+    // to make it easier to know which views to drop-create
+    if (isPersistedAsView(artifact) && isPersistedAsView(otherArtifact)) {
+      // TODO: Check only on artifact.query/projection BUT: Need to manually check for sql-snippets then!
+      artifact[isChanged] = JSON.stringify(artifact) !== JSON.stringify(otherArtifact);
+    }
+
+    // Looking for added entities and added/deleted/changed elements.
+    // Parameters: `artifact` from afterModel and `otherArtifact` from beforeModel.
+
+    if (!isPersisted) // Artifact not persisted in afterModel.
+      return;
+
+    if (!isPersistedOther) {
+      extensions[name] = artifact;
+      return;
+    }
+
+    // Artifact changed?
+
+    addElements();
+    changePropsOrRemoveOrChangeElements();
+    if (hasPrimaryKeyChange)
+      changedPrimaryKeys.push(name);
 
     function addElements() {
       const elements = {};
       const keysNow = [];
       forEachMember(artifact, (element, eName) => {
         getElementComparator(otherArtifact, elements)(element, eName);
-        if(element.key)
+        if (element.key)
           keysNow.push(eName);
       }, [ 'definitions', name ], true, { elementsOnly: true });
 
       // Only do this check for to.hdi.migration - the order only "bites" us when doing .hdbmigrationtable as the end-check against the intended
       // create-table will fail. TODO: Does a mismatched order of the primary key hurt us for postgres and others?
-      if(!hasPrimaryKeyChange && options.sqlDialect === 'hana' && options.src === 'hdi') {
+      if (!hasPrimaryKeyChange && options.sqlDialect === 'hana' && options.src === 'hdi') {
         const keysOther = [];
         forEachMember(otherArtifact, (element, eName) => {
-          if(element.key)
+          if (element.key)
             keysOther.push(eName);
         }, [ 'definitions', name ], true, { elementsOnly: true });
 
-        if(keysNow.join(',') !== keysOther.join(','))
+        if (keysNow.join(',') !== keysOther.join(','))
           hasPrimaryKeyChange = true;
       }
 
       if (Object.keys(elements).length > 0) {
         const added = addedElements(name, elements);
-        if(!hasPrimaryKeyChange)
+        if (!hasPrimaryKeyChange) {
           forEach(added.elements, (_name, element) => {
-            if(element.key && !element.target)
+            if (element.key && !element.target)
               hasPrimaryKeyChange = true;
-          });    
+          });
+        }
         extensions.push(added);
       }
     }
@@ -118,128 +157,101 @@ function getExtensionAndMigrations(beforeModel, options, { extensions, migration
 
       const migration = { migrate: name };
 
-      Object.keys(relevantProperties).forEach(prop => {
-        if (artifact[prop] !== otherArtifact[prop]) {
+      Object.keys(relevantProperties).forEach((prop) => {
+        if (artifact[prop] !== otherArtifact[prop])
           changedProperties[prop] = changedElement(artifact[prop], otherArtifact[prop] || null);
-        }
       });
 
       const removedConstraints = {};
 
       // HDI (src === 'hdi) does handle table constraints via separate files and therefore no delta handling needed
-      if(options.src === 'sql' && (artifact.$tableConstraints  || otherArtifact.$tableConstraints)) {
+      if (options.src === 'sql' && (artifact.$tableConstraints || otherArtifact.$tableConstraints)) {
         const current = artifact.$tableConstraints || {};
         const old = otherArtifact.$tableConstraints || {};
         let changes = false;
-        const constraintTypes = ['unique', 'referential'];
-        constraintTypes.forEach(constraintType => {
+        const constraintTypes = [ 'unique', 'referential' ];
+        constraintTypes.forEach((constraintType) => {
           // We only render/handle referential constraints for specific cases
-          if(hasReferentialConstraints(options) || constraintType !== 'referential')
-            if(current[constraintType] || old[constraintType]) {
+          if (hasReferentialConstraints(options) || constraintType !== 'referential') {
+            if (current[constraintType] || old[constraintType]) {
               removedConstraints[constraintType] = Object.create(null);
 
               const cnew = current[constraintType] || Object.create(null);
               const cold = old[constraintType] || Object.create(null);
               forEachKey(cnew, (constraintName) => {
-                if(cold[constraintName]) {
-                  // constraint changed - add it to "removedConstraints" to drop-create it.
-                  // Quick-and-dirty compare with JSON.stringify - false-positive will just be a drop-create
-                  if(JSON.stringify(cold[constraintName]) !== JSON.stringify(cnew[constraintName])) {
+                if (cold[constraintName]) {
+                // constraint changed - add it to "removedConstraints" to drop-create it.
+                // Quick-and-dirty compare with JSON.stringify - false-positive will just be a drop-create
+                  if (JSON.stringify(cold[constraintName]) !== JSON.stringify(cnew[constraintName])) {
                     changes = true;
                     removedConstraints[constraintType][constraintName] = cold[constraintName];
-                    if(options.constraintsInCreateTable || constraintType !== 'referential') // schedule an "ADD"
-                      extensions.push(addedConstraint(name, cnew[constraintName], constraintName,  constraintType));
-                  } else {
+                    if (options.constraintsInCreateTable || constraintType !== 'referential') // schedule an "ADD"
+                      extensions.push(addedConstraint(name, cnew[constraintName], constraintName, constraintType));
+                  }
+                  else {
                     unchangedConstraints.add(constraintName);
                   }
-                } else if(options.constraintsInCreateTable || constraintType !== 'referential'){
-                  // Sometimes referential constraints are anyway added via ALTER - no need to add them as explicit extensions then
-                  extensions.push(addedConstraint(name, cnew[constraintName], constraintName,  constraintType));
+                }
+                else if (options.constraintsInCreateTable || constraintType !== 'referential') {
+                // Sometimes referential constraints are anyway added via ALTER - no need to add them as explicit extensions then
+                  extensions.push(addedConstraint(name, cnew[constraintName], constraintName, constraintType));
                 }
               });
 
               forEachKey(cold, (constraintName) => {
-                if(!cnew[constraintName]) {
+                if (!cnew[constraintName]) {
                   changes = true;
                   removedConstraints[constraintType][constraintName] = cold[constraintName];
                 }
-              })
+              });
             }
+          }
         });
 
-        if(changes)
+        if (changes)
           migration.removeConstraints = removedConstraints;
       }
 
-      if (Object.keys(changedProperties).length > 0) {
+      if (Object.keys(changedProperties).length > 0)
         migration.properties = changedProperties;
-      }
+
 
       forEachMember(otherArtifact, getElementComparator(artifact, removedElements), [ 'definitions', name ], true, { elementsOnly: true });
       if (Object.keys(removedElements).length > 0) {
         migration.remove = removedElements;
-        if(!hasPrimaryKeyChange)
+        if (!hasPrimaryKeyChange) {
           forEach(removedElements, (_name, change) => {
-            if(change.key && !change.target)
+            if (change.key && !change.target)
               hasPrimaryKeyChange = true;
           });
+        }
       }
 
       forEachMember(artifact, getElementComparator(otherArtifact, null, changedElements), [ 'definitions', name ], true, { elementsOnly: true });
       if (Object.keys(changedElements).length > 0) {
         migration.change = changedElements;
-        if(!hasPrimaryKeyChange)
+        if (!hasPrimaryKeyChange) {
           forEach(changedElements, (_name, change) => {
-            if(!change.onlyDoc && (change.old.key || change.new.key) && !change.new.target && !change.old.target) {
-              // For to.hdi.migration: Just drop-create (commented out), for to.sql.migration: Handle case where we add/remove "key" keyword, no drop-create otherwise
-              if(options.sqlDialect === 'hana' && options.src === 'hdi' || (!change.old.key || !change.new.key)) {
+            if (!change.onlyDoc && (change.old.key || change.new.key) && !change.new.target && !change.old.target) {
+            // For to.hdi.migration: Just drop-create (commented out), for to.sql.migration: Handle case where we add/remove "key" keyword, no drop-create otherwise
+              if (options.sqlDialect === 'hana' && options.src === 'hdi' || (!change.old.key || !change.new.key))
                 hasPrimaryKeyChange = true;
-              }
             }
           });
+        }
       }
 
-      if (migration.properties || migration.remove || migration.change || migration.removeConstraints) {
+      if (migration.properties || migration.remove || migration.change || migration.removeConstraints)
         migrations.push(migration);
-      }
-    }
-
-    const otherArtifact = beforeModel.definitions[name];
-    const isPersisted = isPersistedAsTable(artifact);
-    const isPersistedOther = otherArtifact && isPersistedAsTable(otherArtifact);
-
-    // to make it easier to know which views to drop-create
-    if(isPersistedAsView(artifact) && isPersistedAsView(otherArtifact)) {
-      // TODO: Check only on artifact.query/projection BUT: Need to manually check for sql-snippets then!
-      artifact[isChanged] = JSON.stringify(artifact) !== JSON.stringify(otherArtifact);
-    }
-
-    // Looking for added entities and added/deleted/changed elements.
-    // Parameters: `artifact` from afterModel and `otherArtifact` from beforeModel.
-
-    if (!isPersisted) // Artifact not persisted in afterModel.
-      return;
-
-    if (!isPersistedOther) {
-      extensions[name] = artifact;
-      return;
-    }
-
-    // Artifact changed?
-
-    addElements();
-    changePropsOrRemoveOrChangeElements();
-    if(hasPrimaryKeyChange) {
-      changedPrimaryKeys.push(name);
     }
   };
 }
 /**
  * Calculate all deleted entities.
- * 
- * @param {CSN.Model} afterModel 
- * @param {CSN.Options} options 
- * @param {object} returnObj 
+ *
+ * @param {CSN.Model} afterModel
+ * @param {CSN.Options} options
+ * @param {object} returnObj
  * @returns {function}
  */
 function getDeletions(afterModel, options, { deletions }) {
@@ -251,8 +263,9 @@ function getDeletions(afterModel, options, { deletions }) {
     // Looking for deleted entities only.
     if (isPersisted && !isPersistedOther) {
       deletions[name] = artifact;
-      // eslint-disable-next-line sonarjs/no-duplicated-branches
-    } else if (isPersistedAsView(artifact) && isPersistedOther) { // view turned into table - need to render a drop for the view
+    }
+    // eslint-disable-next-line sonarjs/no-duplicated-branches
+    else if (isPersistedAsView(artifact) && isPersistedOther) { // view turned into table - need to render a drop for the view
       deletions[name] = artifact;
     }
   };
@@ -260,37 +273,40 @@ function getDeletions(afterModel, options, { deletions }) {
 
 function getElementComparator(otherArtifact, addedElementsDict = null, changedElementsDict = null) {
   return function compareElements(element, name) {
-    if (element.$ignore) {
+    if (element.$ignore)
       return;
-    }
+
 
     const otherElement = otherArtifact.elements[name];
     if (otherElement && !otherElement.$ignore) {
       // Element type changed?
-      if (!changedElementsDict) {
+      if (!changedElementsDict)
         return;
-      }
+
       if (relevantTypeChange(element.type, otherElement.type) || typeParametersChanged(element, otherElement)) {
         // Type or parameters, e.g. association target, changed.
-        if(otherElement.notNull && element.notNull === undefined) {
-          element.$notNull = false; // Explicitly set notNull to the implicit default so we render the correct ALTER
-        }
+        if (otherElement.notNull && element.notNull === undefined && !element.key || otherElement.key && !element.key && !element.notNull)
+          setProp(element, '$notNull', false); // Explicitly set notNull to the implicit default so we render the correct ALTER
+
+        if (otherElement.default && element.default === undefined)
+          setProp(element, '$default', { val: null }); // Explicitly set default to the implicit default "null" so we render the correct ALTER
+
         changedElementsDict[name] = changedElement(element, otherElement);
-      } else if(docCommentChanged(element, otherElement)) {
+      }
+      else if (docCommentChanged(element, otherElement)) {
         changedElementsDict[name] = { ...changedElement(element, otherElement), onlyDoc: true };
       }
 
       return;
     }
 
-    if (addedElementsDict) {
+    if (addedElementsDict)
       addedElementsDict[name] = element;
-    }
-  }
+  };
 }
 
 function relevantTypeChange(type, otherType) {
-  return otherType !== type && !isSuperflousHanaTypeChange(otherType, type) && ![type, otherType].every(t => ['cds.Association', 'cds.Composition'].includes(t));
+  return otherType !== type && !isSuperflousHanaTypeChange(otherType, type) && ![ type, otherType ].every(t => [ 'cds.Association', 'cds.Composition' ].includes(t));
 }
 
 const superflousTypeChanges = {
@@ -301,7 +317,7 @@ const superflousTypeChanges = {
   'cds.UTCDateTime': 'cds.DateTime',
   'cds.UTCTimestamp': 'cds.Timestamp',
   'cds.LocalDate': 'cds.Date',
-  'cds.LocalTime': 'cds.Time' ,
+  'cds.LocalTime': 'cds.Time',
 };
 
 /**
@@ -319,11 +335,11 @@ function isSuperflousHanaTypeChange( before, after ) {
 /**
  * If the element has one of the superflous types, do the change so we don't accidentally
  * pass such an old type into the SQL renderer.
- * @param {CSN.Element} element 
+ * @param {CSN.Element} element
  * @returns {CSN.Element}
  */
 function remapType( element ) {
-  if(element?.type && superflousTypeChanges[element.type])
+  if (element?.type && superflousTypeChanges[element.type])
     element.type = superflousTypeChanges[element.type];
   return element;
 }
@@ -351,23 +367,18 @@ function deepEqual(a, b, include = () => true, depth = 0) {
     return Object.keys(a).reduce((prev, key) => prev && (!include(key, depth) || deepEqual(a[key], b[key], include, depth + 1)), true);
   }
 
-  return isObject(a)
-      ? isObject(b)
-          ? samePropertyCount() && allPropertiesEqual()
-          : false
-      : a === b;
+  if (isObject(a)) {
+    return isObject(b)
+      ? samePropertyCount() && allPropertiesEqual()
+      : false;
+  }
+  return a === b;
 }
 
 function docCommentChanged(element, otherElement) {
   return element.doc && !otherElement.doc || otherElement.doc && !element.doc || element.doc && element.doc !== otherElement.doc;
 }
 
-const relevantProperties = {
-  'doc': true,
-  '@sql.prepend': true,
-  '@sql.append': true
-};
-
 /**
  * Returns whether any type parameters differ between two given elements. Ignores whether types themselves differ (`type` property) and ignores
  * diff in doc comments.
@@ -378,18 +389,20 @@ const relevantProperties = {
 function typeParametersChanged(element, otherElement) {
   const checked = new Set();
   for (const key in element) {
-    if (Object.prototype.hasOwnProperty.call(element, key))
-      if((!key.startsWith('@') || relevantProperties[key]) && key !== 'type' && key !== 'doc') {
+    if (Object.prototype.hasOwnProperty.call(element, key)) {
+      if ((!key.startsWith('@') || relevantProperties[key]) && key !== 'type' && key !== 'doc') {
         checked.add(key);
-        if(!deepEqual(element[key], otherElement[key]))
+        if (!deepEqual(element[key], otherElement[key]))
           return true;
-      }  
+      }
+    }
   }
 
   for (const key in otherElement) {
-    if (Object.prototype.hasOwnProperty.call(otherElement, key))
-      if((!key.startsWith('@') || relevantProperties[key]) && key !== 'type' &&  key !== 'doc' && !checked.has(key))
+    if (Object.prototype.hasOwnProperty.call(otherElement, key)) {
+      if ((!key.startsWith('@') || relevantProperties[key]) && key !== 'type' && key !== 'doc' && !checked.has(key))
         return true;
+    }
   }
 
   return false;
@@ -398,7 +411,7 @@ function typeParametersChanged(element, otherElement) {
 function addedElements(entity, elements) {
   return {
     extend: entity,
-    elements
+    elements,
   };
 }
 
@@ -408,24 +421,24 @@ function addedConstraint(entity, constraint, constraintName, constraintType) {
     constraint,
     constraintName,
     constraintType,
-  }
+  };
 }
 
 function changedElement(element, otherElement) {
   return {
     old: remapType(otherElement),
-    new: element
+    new: element,
   };
 }
 
 function hasReferentialConstraints(options) {
-  return options.src === 'sql' && (options.sqlDialect === 'postgres' || options.sqlDialect === 'hana' || options.sqlDialect === 'sqlite')
+  return options.src === 'sql' && (options.sqlDialect === 'postgres' || options.sqlDialect === 'hana' || options.sqlDialect === 'sqlite');
 }
 
 module.exports = {
   compareModels,
   deepEqual,
-  isChanged
+  isChanged,
 };
 
 /**

package/lib/optionProcessor.js

@@ -145,6 +145,7 @@ optionProcessor
     O, toOdata [options] <files...>             Generate ODATA metadata and annotations
     C, toCdl <files...>                         Generate CDS source files
     Q, toSql [options] <files...>               Generate SQL DDL statements
+    J, forJava [options] <files...>             Generate CSN for the Java Runtime
        toCsn [options] <files...>               (default) Generate original model as CSN
        parseCdl [options] <file>                Generate a CSN that is close to the CDL source.
        explain <message-id>                     Explain a compiler message.
@@ -154,7 +155,8 @@ optionProcessor
        manageConstraints [options] <files...>   (internal) Generate ALTER TABLE statements to
                                                            add / modify referential constraints.
        inspect [options] <files...>             (internal) Inspect the given CDS files.
-       toEffectiveCsn [options] <files...>      (internal) Get an effective CSN for SEAL; requires beta mode
+       toEffectiveCsn [options] <files...>      (internal) Get an effective CSN; requires beta mode
+       forSeal [options] <files...>             (internal) Get a SEAL CSN
 
   Environment variables
     NO_COLOR                If set, compiler messages (/output) will not be colored.
@@ -224,6 +226,7 @@ optionProcessor.command('O, toOdata')
   .option('    --odata-containment')
   .option('    --odata-capabilities-pullup')
   .option('    --odata-openapi-hints')
+  .option('    --edm4openapi', { optionName: 'edm4OpenAPI' })
   .option('    --odata-proxies')
   .option('    --odata-x-service-refs')
   .option('    --odata-foreign-keys')
@@ -254,6 +257,7 @@ optionProcessor.command('O, toOdata')
        --odata-containment         Generate Containment Navigation Properties for compositions (V4 only)
        --odata-capabilities-pullup Rewrite @Capabilities annotations (V4 containment only).
        --odata-openapi-hints       Add various annotations to JSON API as input for OpenAPI generation.
+       --edm4openapi               Downgrade some errors to warnings for OpenAPI generation.
        --odata-proxies             Generate Proxies for out-of-service navigation targets (V4 only).
        --odata-x-service-refs      Generate schema references (V4 only).
        --odata-foreign-keys        Render foreign keys in structured format (V4 only)
@@ -274,6 +278,17 @@ optionProcessor.command('O, toOdata')
                              those views, that only have an association to a localized entity/view.
 `);
 
+optionProcessor.command('J, forJava')
+  .option('-h, --help')
+  .help(`
+  Usage: cdsc forJava [options] <files...>
+
+  Generate CSN (structured) for Java Runtime.
+
+  Options
+   -h, --help      Show this help text
+`);
+
 optionProcessor.command('C, toCdl')
   .option('-h, --help')
   .help(`
@@ -530,6 +545,10 @@ optionProcessor.command('inspect')
 
 optionProcessor.command('toEffectiveCsn')
   .option('-h, --help')
+  .option('--resolve-simple-types <val>', { valid: ['true', 'false'] } )
+  .option('--resolve-projections <val>', { valid: ['true', 'false'] } )
+  .option('--remap-odata-annotations <val>', { valid: ['true', 'false'] } )
+  .option('--keep-localized <val>', { valid: ['true', 'false'] } )
   .positionalArgument('<files...>')
   .help(`
   Usage: cdsc toEffectiveCsn [options] <files...>
@@ -539,7 +558,35 @@ optionProcessor.command('toEffectiveCsn')
   Beta mode is required.
 
   Options
-   -h, --help                Show this help text
+   -h, --help                            Show this help text
+       --resolve-simple-types <val>      Resolve simple types:
+                                          true: (default) resolve simple type references to their simple base type
+                                          false:          do not resolve simple type references
+       --resolve-projections <val>       Resolve projections:
+                                          true: (default) transform projections into ordinary views with SELECT
+                                          false:          leave them as real projections
+       --remap-odata-annotations <val>   Remap OData annotations to ABAP annotations:
+                                          true:           remap annotations
+                                          false:(default) leave them as is
+       --keep-localized <val>            Keep '.localized' property in the CSN:
+                                          true:           property is kept
+                                          false:(default) property is deleted
+`);
+
+optionProcessor.command('forSeal')
+  .option('-h, --help')
+  .option('--remap-odata-annotations <val>', { valid: ['true', 'false'] } )
+  .positionalArgument('<files...>')
+  .help(`
+  Usage: cdsc forSeal [options] <files...>
+
+  (internal): Get the SEAL CSN model compiled from the provided CDS files.
+
+  Options
+   -h, --help                            Show this help text
+       --remap-odata-annotations <val>   Remap OData annotations to ABAP annotations:
+                                          true: (default)   remap annotations
+                                          false:            leave them as is
 `);
 
 module.exports = {

package/lib/render/DuplicateChecker.js

@@ -97,12 +97,12 @@ class DuplicateChecker {
           else
             namingMode = 'plain';
 
-          error(null, [ 'definitions', artifact.modelName ],
-                { name: collidesWith.modelName, prop: namingMode, '#': artifact.modelName.includes('.') ? 'dots' : 'std' },
-                {
-                  std: 'Artifact name can\'t be mapped to a SQL compliant identifier in naming mode $(PROP) because it conflicts with existing definition $(NAME)',
-                  dots: 'Artifact name containing dots can\'t be mapped to a SQL compliant identifier in naming mode $(PROP) because it conflicts with existing definition $(NAME)',
-                });
+          error(null, [ 'definitions', artifact.modelName ], {
+            name: collidesWith.modelName, prop: namingMode, '#': artifact.modelName.includes('.') ? 'dots' : 'std',
+          }, {
+            std: 'Artifact name can\'t be mapped to a SQL compliant identifier in naming mode $(PROP) because it conflicts with existing definition $(NAME)',
+            dots: 'Artifact name containing dots can\'t be mapped to a SQL compliant identifier in naming mode $(PROP) because it conflicts with existing definition $(NAME)',
+          });
         });
       }
       artifacts.forEach((artifact) => {

package/lib/render/manageConstraints.js

@@ -32,6 +32,7 @@ function alterConstraintsWithCsn( csn, options, messageFunctions ) {
     warning(null, null, { prop: sqlDialect || 'plain' }, 'Referential Constraints are not available for sql dialect $(PROP)');
 
   if (drop && alter)
+    // eslint-disable-next-line cds-compiler/message-no-quotes
     error(null, null, 'Option “--drop” can\'t be combined with “--alter”');
 
   // Of course, we want the database constraints

package/lib/render/toCdl.js

@@ -9,13 +9,14 @@ const { forEachDefinition, normalizeTypeRef } = require('../model/csnUtils');
 const enrichUniversalCsn = require('../transform/universalCsn/universalCsnEnricher');
 const { isBetaEnabled } = require('../base/model');
 const { ModelError } = require('../base/error');
-const { typeParameters, specialFunctions, isAnnotationExpression } = require('../compiler/builtins');
+const { typeParameters, specialFunctions } = require('../compiler/builtins');
+const { isAnnotationExpression } = require('../base/builtins');
 const { forEach } = require('../utils/objectUtils');
 const {
-  isBuiltinType,
   generatedByCompilerVersion,
   getNormalizedQuery,
 } = require('../model/csnUtils');
+const { isBuiltinType } = require('../base/builtins');
 const { cloneFullCsn } = require('../model/cloneCsn');
 
 const identifierRegex = /^[$_a-zA-Z][$_a-zA-Z0-9]*$/;
@@ -613,10 +614,12 @@ function csnToCdl( csn, options, msg ) {
     else if (element['#'] !== undefined) { // enum symbol reference
       result += ` = #${element['#']}`;
     }
-    else if (!isCalcElement || !isDirectAssocOrComp(element.type)) {
+    else if (!isCalcElement || !isDirectAssocOrComp(element.type) && !element.$filtered) {
       // If the element is a calculated element _and_ a direct association or
       // composition, we'd render `Association to F on (cond) = calcValue;` which
       // would alter the ON-condition.
+      // If it is a calculated element _and_ an indirect association (via type chain),
+      // we'd get a cast to an association.
       const props = renderTypeReferenceAndProps(element, env);
       if (props !== '')
         result += ` : ${props}`;