@sap/cds-dk 10.1.2 → 10.2.1

package/node_modules/@sap/cds-compiler/lib/render/utils/sql.js

@@ -2,7 +2,7 @@
 
 'use strict';
 
-const { getResultingName } = require('../../model/csnUtils');
+const { getResultingName } = require('../../base/csnUtils');
 const { smartId, delimitedId, sqlDialects } = require('../../sql-identifier');
 const { ModelError } = require('../../base/error');
 const { setProp } = require('../../utils/objectUtils');
@@ -41,8 +41,9 @@ function renderReferentialConstraint( constraint, indent, toUpperCase, csn, opti
     result += `${ indent }REFERENCES ${ quoteId(getResultingName(csn, sqlMapping, constraint.parentTable)) }(${ constraint.parentKey.map(quoteId).join(', ') })\n`;
     const onDeleteRemark = constraint.onDeleteRemark ? ` -- ${ constraint.onDeleteRemark }` : '';
 
-    // omit 'RESTRICT' action for ON UPDATE / ON DELETE, because it interferes with deferred constraint check
-    if (sqlDialect === 'sqlite' || sqlDialect === 'postgres') {
+    // omit 'RESTRICT' action for ON UPDATE / ON DELETE, because it interferes with deferred constraint check.
+    // h2 does not support ON UPDATE RESTRICT either, and cannot defer constraints at all.
+    if (sqlDialect === 'sqlite' || sqlDialect === 'postgres' || sqlDialect === 'h2') {
       if (constraint.onDelete === 'CASCADE' )
         result += `${ indent }ON DELETE ${ constraint.onDelete }${ onDeleteRemark }\n`;
     }
@@ -52,14 +53,19 @@ function renderReferentialConstraint( constraint, indent, toUpperCase, csn, opti
     }
   }
   // constraint enforcement / validation must be switched off using sqlite pragma statement
-  // constraint enforcement / validation not supported by postgres
-  if (options.toSql && sqlDialect !== 'sqlite' && sqlDialect !== 'postgres') {
+  // constraint enforcement / validation not supported by postgres / h2
+  if (options.toSql && sqlDialect !== 'sqlite' && sqlDialect !== 'postgres' && sqlDialect !== 'h2') {
     result += `${ indent }${ !constraint.validated ? 'NOT ' : '' }VALIDATED\n`;
     result += `${ indent }${ !constraint.enforced ? 'NOT ' : '' }ENFORCED\n`;
   }
-  // for sqlite and postgreSQL, the DEFERRABLE keyword is required
-  result += `${ indent }${ sqlDialect === 'sqlite' || sqlDialect === 'postgres' ? 'DEFERRABLE ' : '' }INITIALLY DEFERRED`;
-  return result;
+  // for sqlite and postgreSQL, the DEFERRABLE keyword is required; h2 cannot defer at all,
+  // so the constraint is checked immediately and no deferral clause is rendered
+  if (sqlDialect !== 'h2')
+    result += `${ indent }${ sqlDialect === 'sqlite' || sqlDialect === 'postgres' ? 'DEFERRABLE ' : '' }INITIALLY DEFERRED`;
+  // postgres skips checking pre-existing rows with `NOT VALID`; must follow the deferral clause
+  if (sqlDialect === 'postgres' && !constraint.validated)
+    result += `\n${ indent }NOT VALID`;
+  return result.replace(/\n$/, '');
 }
 
 /**
@@ -206,11 +212,12 @@ function _artifactIsProjectionView( csn, artifact ) {
     referencedElements[column.ref.at(-1)] = true;
   }
 
-  // Full primary key/not null chain needs to be projected according to HANA SQL spec
+  // All key elements and not-null elements without defaults need to be projected according to HANA SQL spec
   // https://help.sap.com/docs/hana-cloud-database/sap-hana-cloud-sap-hana-database-sql-reference-guide/create-projection-view-statement-data-definition
   for (const elementName in source.elements) {
     const element = source.elements[elementName];
-    if ((element.notNull || element.key) && !referencedElements[elementName])
+    const mustBeProjected = element.key || (element.notNull && element.default === undefined);
+    if (mustBeProjected && !referencedElements[elementName])
       return false;
   }
 

package/node_modules/@sap/cds-compiler/lib/transform/db/assertUnique.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { forEachDefinition } = require('../../model/csnUtils');
+const { forEachDefinition } = require('../../base/csnUtils');
 const { getTransformers } = require('../transformUtils');
 const { pathName } = require('../../compiler/utils');
 

package/node_modules/@sap/cds-compiler/lib/transform/db/associations.js

@@ -6,7 +6,7 @@ const {
   applyTransformations,
   implicitAs,
   isSimpleAnnoExprRef,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 
 /**
  * In all .elements of entities and views (and their bound actions/functions), create the on-condition for
@@ -137,9 +137,8 @@ function getFKAccessFinalizer( csn, options, csnUtils, pathDelimiter, processOnI
         if (obj[anno].ref)
           transformer.ref(obj[anno], 'ref', obj[anno].ref, path.concat(anno));
         const annoAfter = JSON.stringify(obj[anno]);
-        if (annoBefore !== annoAfter &&
-            (options.transformation !== 'effective' || obj[anno]['=']) &&
-            !(obj[anno].ref && isSimpleAnnoExprRef(obj[anno])))
+        // TODO: what is this good for? safety net?
+        if (annoBefore !== annoAfter && obj[anno]['='] && !isSimpleAnnoExprRef(obj[anno]))
           obj[anno]['='] = true;
       });
   }

package/node_modules/@sap/cds-compiler/lib/transform/db/assocsToQueries/transformExists.js

@@ -2,7 +2,7 @@
 
 const {
   forAllQueries, forEachDefinition, walkCsnPath, transformExpression,
-} = require('../../../model/csnUtils');
+} = require('../../../base/csnUtils');
 const { setProp } = require('../../../utils/objectUtils');
 const { getHelpers } = require('./utils');
 

package/node_modules/@sap/cds-compiler/lib/transform/db/backlinks.js

@@ -2,7 +2,7 @@
 
 const {
   applyTransformationsOnNonDictionary, isAssociationOperand, isDollarSelfOrProjectionOperand,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 
 const { setProp } = require('../../utils/objectUtils');
 const { forEach } = require('../../utils/objectUtils');
@@ -16,7 +16,7 @@ const { ModelError } = require('../../base/error');
  * @param {CSN.Options} options
  * @param {string} pathDelimiter
  * @param {boolean} doA2J
- * @returns {import('../../model/csnUtils').genericCallback} callback for forEachDefinition
+ * @returns {import('../../base/csnUtils').genericCallback} callback for forEachDefinition
  */
 function getBacklinkTransformer( csnUtils, messageFunctions, options, pathDelimiter, doA2J = true ) {
   let prepend$self = false;

package/node_modules/@sap/cds-compiler/lib/transform/db/cdsPersistence.js

@@ -4,7 +4,7 @@ const {
   forEachMemberRecursively,
   isPersistedOnDatabase,
   hasPersistenceSkipAnnotation,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { recurseElements } = require('../transformUtils');
 
 /**

package/node_modules/@sap/cds-compiler/lib/transform/db/constraints.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { applyTransformations, getResultingName, hasPersistenceSkipAnnotation } = require('../../model/csnUtils');
+const { applyTransformations, getResultingName, hasPersistenceSkipAnnotation } = require('../../base/csnUtils');
 const { forEach, forEachKey } = require('../../utils/objectUtils');
 const { CompilerAssertion } = require('../../base/error');
 
@@ -601,14 +601,14 @@ function createReferentialConstraints( csn, options ) {
  * Their `DraftAdministrativeData` association is unmanaged and points at the service view, so the
  * regular pass skips it; this pass references the `DRAFT.DraftAdministrativeData` table directly.
  *
- * Opt-in via the `draftAdminDataConstraints` option and independent of the global
+ * Opt-in via the `draft_admin_integrity` option and independent of the global
  * `assertIntegrity` / `assertIntegrityType` switches.
  *
  * @param {CSN.Model} csn
  * @param {CSN.Options} options
  */
 function createDraftAdminDataConstraints( csn, options ) {
-  if (options.draftAdminDataConstraints !== true)
+  if (options.draft_admin_integrity !== true)
     return;
 
   const draftAdminData = 'DRAFT.DraftAdministrativeData';
@@ -618,7 +618,8 @@ function createDraftAdminDataConstraints( csn, options ) {
   const delimiter = options.sqlMapping === 'hdbcds' ? '.' : '_';
   const foreignKeyName = `DraftAdministrativeData${ delimiter }DraftUUID`;
 
-  const validated = !options.integrityNotValidated;
+  // always NOT VALIDATED: pre-existing violating shadow rows must not block deployment,
+  // which can't be cleaned up manually in multitenant apps (h2 can't skip the check though)
   const enforced = !options.integrityNotEnforced;
 
   forEach(csn.definitions, ( artifactName, artifact ) => {
@@ -647,7 +648,7 @@ function createDraftAdminDataConstraints( csn, options ) {
       parentTable: draftAdminData,
       onDelete: 'CASCADE',
       onDeleteRemark: options.testMode ? 'Draft shadow entries are deleted when their DraftAdministrativeData entry is deleted' : null,
-      validated,
+      validated: false,
       enforced,
     };
   });

package/node_modules/@sap/cds-compiler/lib/transform/db/expansion.js

@@ -5,7 +5,7 @@ const {
   walkCsnPath,
   getUtils,
   forEachDefinition,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { implicitAs, columnAlias, pathId } = require('../../base/csnRefs');
 const { setProp } = require('../../utils/objectUtils');
 const { killNonrequiredAnno } = require('./killAnnotations');
@@ -51,9 +51,15 @@ function expandStructureReferences( csn, options, pathDelimiter, messageFunction
     },
     groupBy: (parent, name, groupBy, path) => {
       parent.groupBy = expand(groupBy, path.concat('groupBy'));
+      // All entries expanded to nothing (e.g. only empty structures) -> no valid clause
+      if (parent.groupBy.length === 0)
+        delete parent.groupBy;
     },
     orderBy: (parent, name, orderBy, path) => {
       parent.orderBy = expand(orderBy, path.concat('orderBy'));
+      // All entries expanded to nothing (e.g. only empty structures) -> no valid clause
+      if (parent.orderBy.length === 0)
+        delete parent.orderBy;
     },
     list: (parent, name, list, path) => {
       parent.list = expand(list, path.concat('list'));

package/node_modules/@sap/cds-compiler/lib/transform/db/flattening.js

@@ -6,7 +6,7 @@ const {
   copyAnnotations,
   implicitAs,
   findAnnotationExpression,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { isBuiltinType, isMagicVariable } = require('../../base/builtins');
 const transformUtils = require('../transformUtils');
 const { csnRefs } = require('../../base/csnRefs');
@@ -665,7 +665,7 @@ function handleManagedAssociationsAndCreateForeignKeys( csn, options, messageFun
         }
 
         if (options.transformation === 'effective') {
-          adaptAnnotationsRefs(fks, csnUtils, messageFunctions, eltPath, options);
+          adaptAnnotationsRefs(fks, csnUtils, messageFunctions, eltPath);
           const validAnnoNames = Object.keys(element).filter(pn => pn[0] === '@' && findAnnotationExpression(element, pn));
           fks.forEach(fk => copyAnnotations(element, fk[1], false, {}, validAnnoNames));
         }

package/node_modules/@sap/cds-compiler/lib/{modelCompare/compare.js → transform/db/migration/diffModels.js}

@@ -1,14 +1,14 @@
 'use strict';
 
-const { makeMessageFunction } = require('../base/messages');
-const { setProp } = require('../utils/objectUtils');
+const { makeMessageFunction } = require('../../../base/messages');
+const { setProp } = require('../../../utils/objectUtils');
 const {
   forEachDefinition,
   forEachMember,
   isPersistedAsTable,
   isPersistedAsView,
-} = require('../model/csnUtils');
-const { forEachKey, forEach } = require('../utils/objectUtils');
+} = require('../../../base/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');
@@ -68,7 +68,7 @@ function validateCsnVersions(beforeModel, afterModel, options) {
   if (beforeVersionParts[0] > afterVersionParts[0] && !(options && options.allowCsnDowngrade)) {
     const { error, throwWithAnyError } = makeMessageFunction(afterModel, options, 'modelCompare');
 
-    const { version } = require('../../package.json');
+    const { version } = require('../../../../package.json');
     error('api-invalid-version', null, {
       '#': 'migrationComparison', value: afterVersion, othervalue: beforeVersion, version,
     });

package/node_modules/@sap/cds-compiler/lib/{modelCompare/utils/filter.js → transform/db/migration/filterDiff.js}

@@ -3,8 +3,8 @@
 // Each db has some changes that it can and cannot represent, or that cause problems only on that specific db
 // In this file, we define rules for each db-dialect to detect and act on these cases.
 
-const { forEach, forEachValue, forEachKey } = require('../../utils/objectUtils');
-const { isPersistedAsTable, applyTransformations } = require('../../model/csnUtils');
+const { forEach, forEachValue, forEachKey } = require('../../../utils/objectUtils');
+const { isPersistedAsTable, applyTransformations } = require('../../../base/csnUtils');
 
 function isKey( element ) {
   return element.key;

package/node_modules/@sap/cds-compiler/lib/transform/db/processSqlServices.js

@@ -2,7 +2,7 @@
 
 const { setProp } = require('../../utils/objectUtils');
 const { isBetaEnabled } = require('../../base/specialOptions');
-const { hasPersistenceSkipAnnotation } = require('../../model/csnUtils');
+const { hasPersistenceSkipAnnotation } = require('../../base/csnUtils');
 
 const sqlServiceAnnotation = '@protocol';
 

package/node_modules/@sap/cds-compiler/lib/transform/db/rewriteCalculatedElements.js

@@ -7,7 +7,7 @@ const {
   applyTransformationsOnNonDictionary,
   applyTransformationsOnDictionary,
   implicitAs,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { getBranches } = require('./flattening');
 const { cloneCsnNonDict } = require('../../base/cloneCsn');
 

package/node_modules/@sap/cds-compiler/lib/transform/db/temporal.js

@@ -2,7 +2,7 @@
 
 const {
   getNormalizedQuery, forEachMember,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { implicitAs } = require('../../base/csnRefs');
 const { setProp } = require('../../utils/objectUtils');
 const { isBetaEnabled } = require('../../base/specialOptions');

package/node_modules/@sap/cds-compiler/lib/transform/db/views.js

@@ -2,7 +2,7 @@
 
 const {
   getUtils, applyTransformationsOnNonDictionary,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { implicitAs, columnAlias, pathId } = require('../../base/csnRefs');
 const { ModelError } = require('../../base/error');
 const { setProp } = require('../../utils/objectUtils');
@@ -233,10 +233,6 @@ function getViewTransformer( csn, options, _messageFunctions ) {
     const columnMap = getColumnMap(query, csnUtils);
     const isSelectStar = query && query.SELECT && query.SELECT.columns && query.SELECT.columns.indexOf('*') !== -1;
 
-    // Second walk through the entity elements: Deal with associations (might also result in new elements)
-    // Will be initialized JIT inside the elements-loop
-    let $combined;
-
     const publishedMixins = new WeakMap();
 
     for (const elemName in elements) {
@@ -244,7 +240,7 @@ function getViewTransformer( csn, options, _messageFunctions ) {
 
       if (isSelect) {
         if (!columnMap[elemName])
-          addProjectionOrStarElement(query, isProjection, isSelectStar, $combined, columnMap, elemName);
+          addProjectionOrStarElement(query, isProjection, isSelectStar, undefined, columnMap, elemName);
       }
 
       // (180 b) Create MIXINs for association elements in projections or views (those that are not mixins by themselves)

package/node_modules/@sap/cds-compiler/lib/transform/draft/db.js

@@ -3,7 +3,7 @@
 const {
   getServiceNames, forEachDefinition,
   getResultingName, forEachMemberRecursively, applyAnnotationsFromExtensions,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { getTransformers } = require('../transformUtils');
 const { ModelError } = require('../../base/error');
 const { setProp, forEach } = require('../../utils/objectUtils');

package/node_modules/@sap/cds-compiler/lib/transform/draft/odata.js

@@ -4,7 +4,7 @@ const {
   forEachDefinition, forEachMemberRecursively,
   getServiceNames, applyAnnotationsFromExtensions,
   transformAnnotationExpression,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { forEach } = require('../../utils/objectUtils');
 const { isArtifactInSomeService, getServiceOfArtifact } = require('../odata/utils');
 const { getTransformers } = require('../transformUtils');

package/node_modules/@sap/cds-compiler/lib/transform/effective/annotations.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { CompilerAssertion } = require('../../base/error');
-const { transformAnnotationExpression } = require('../../model/csnUtils');
+const { transformAnnotationExpression } = require('../../base/csnUtils');
 const { expressionToCdlString } = require('../../render/toCdl');
 const { forEach } = require('../../utils/objectUtils');
 

package/node_modules/@sap/cds-compiler/lib/transform/effective/associations.js

@@ -4,7 +4,7 @@ const { setProp } = require('../../utils/objectUtils');
 const flattening = require('../db/flattening');
 const {
   applyTransformations, forEachDefinition, forEachMemberRecursively, forEachMember, applyTransformationsOnNonDictionary,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const associations = require('../db/associations');
 const backlinks = require('../db/backlinks');
 

package/node_modules/@sap/cds-compiler/lib/transform/effective/flattening.js

@@ -2,7 +2,7 @@
 
 const {
   forEachDefinition, forEachMemberRecursively, applyTransformationsOnNonDictionary, transformExpression, transformAnnotationExpression,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { getStructStepsFlattener } = require('../db/flattening');
 const { setProp, forEach } = require('../../utils/objectUtils');
 

package/node_modules/@sap/cds-compiler/lib/transform/effective/main.js

@@ -2,7 +2,7 @@
 
 const {
   getUtils, mergeTransformers, applyTransformations, forEachDefinition,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const transformUtils = require('../transformUtils');
 const effectiveFlattening = require('./flattening');
 const flattening = require('../db/flattening');
@@ -114,10 +114,11 @@ function effectiveCsn( model, options, messageFunctions ) {
       if (!param.elements)
         continue;
       for (const element of Object.values(param.elements)) {
-        if (element.keys)
+        if (element.keys) {
           element.keys.forEach((key) => {
             key.ref = [ key.ref.join('_') ];
           });
+        }
       }
     }
   });

package/node_modules/@sap/cds-compiler/lib/transform/effective/misc.js

@@ -2,7 +2,7 @@
 
 const {
   getArtifactDatabaseNameOf, getElementDatabaseNameOf,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 /**
  * Attach @cds.persistence.name to all artifacts and "things".
  * We could also do it more selectively like we do in forRelationalDb, but: Why? Space maybe?
@@ -91,6 +91,7 @@ function _removeDefinitionsAndProperties( csn, options ) {
     excluding: killProp, // * is resolved, so has no effect anymore
     targetAspect: killProp,
     $calc: killProp,
+    $backlink: killProp,
   };
 
   if (!options.keepLocalized)

package/node_modules/@sap/cds-compiler/lib/transform/effective/queries.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { forEachDefinition, applyTransformationsOnNonDictionary } = require('../../model/csnUtils');
+const { forEachDefinition, applyTransformationsOnNonDictionary } = require('../../base/csnUtils');
 
 /**
  * - Make .projections look like simple SELECTS

package/node_modules/@sap/cds-compiler/lib/transform/effective/types.js

@@ -4,7 +4,7 @@ const {
   applyTransformations,
   applyTransformationsOnNonDictionary,
   applyTransformationsOnDictionary,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { forEachKey } = require('../../utils/objectUtils');
 const { cloneCsnDict, cloneCsnNonDict } = require('../../base/cloneCsn');
 const propertiesToSkipForCasts = { enum: true };

package/node_modules/@sap/cds-compiler/lib/transform/forOdata.js

@@ -12,7 +12,7 @@ const {
   forEachGeneric,
   cardinality2str,
   getUtils,
-} = require('../model/csnUtils');
+} = require('../base/csnUtils');
 const { checkCSNVersion } = require('../json/csnVersion');
 const validate = require('../checks/validator');
 const { timetrace } = require('../utils/timetrace');

package/node_modules/@sap/cds-compiler/lib/transform/forRelationalDB.js

@@ -6,7 +6,7 @@ const {
   applyTransformationsOnNonDictionary,
   getArtifactDatabaseNameOf, getElementDatabaseNameOf, applyTransformations,
   walkCsnPath,
-} = require('../model/csnUtils');
+} = require('../base/csnUtils');
 const transformUtils = require('./transformUtils');
 const { translateAssocsToJoinsCSN } = require('./translateAssocsToJoins');
 const {
@@ -22,7 +22,7 @@ const { setProp, forEach } = require('../utils/objectUtils');
 const handleExists = require('./db/assocsToQueries/transformExists');
 const { rewriteCalculatedElementsInViews, processCalculatedElementsInEntities } = require('./db/rewriteCalculatedElements');
 const replaceAssociationsInGroupByOrderBy = require('./db/groupByOrderBy');
-const _forEachDefinition = require('../model/csnUtils').forEachDefinition;
+const _forEachDefinition = require('../base/csnUtils').forEachDefinition;
 const flattening = require('./db/flattening');
 const expansion = require('./db/expansion');
 const assertUnique = require('./db/assertUnique');
@@ -39,6 +39,7 @@ const { cloneFullCsn } = require('../base/cloneCsn');
 const { processSqlServices, createServiceDummy } = require('./db/processSqlServices');
 const { expandWildcard } = require('./db/expansion');
 const removeEnums = require('../checks/enums');
+const { csnVersion } = require('../json/to-csn');
 const {
   getQueryFeatureFlagSetter, getDefinitionFeatureFlagSetter,
 } = require('../checks/featureFlags');
@@ -341,8 +342,10 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
   generateDrafts(csn, options, pathDelimiter, messageFunctions);
 
   // the DraftAdministrativeData_DraftUUID foreign key still gets a cascade constraint;
-  // must run after generateDrafts, as the shadow tables don't exist before
-  if (options.sqlDialect !== 'plain' && options.sqlDialect !== 'h2')
+  // must run after generateDrafts, as the shadow tables don't exist before.
+  // Unlike general constraints, these are also rendered for h2: it cannot defer them, but
+  // the cascade does not rely on deferral, so an immediately-checked constraint is fine.
+  if (options.sqlDialect !== 'plain')
     createDraftAdminDataConstraints(csn, options);
 
   // Set the final constraint paths and produce hana tc indexes if required
@@ -478,6 +481,8 @@ function transformForRelationalDBWithCsn(csn, options, messageFunctions) {
 
   timetrace.stop('Transform CSN');
   timetrace.stop('HANA transformation');
+  if (!options.testMode && csn && csn.$version === undefined)
+    setProp(csn, '$version', csnVersion);
   return csn;
 
   /* ----------------------------------- Functions start here -----------------------------------------------*/

package/node_modules/@sap/cds-compiler/lib/transform/localized.js

@@ -8,7 +8,7 @@ const {
   forEachDefinition,
   forEachGeneric,
   forAllQueries,
-} = require('../model/csnUtils');
+} = require('../base/csnUtils');
 const { CompilerAssertion } = require('../base/error');
 const {
   cloneCsnDict,

package/node_modules/@sap/cds-compiler/lib/transform/odata/adaptAnnotationRefs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { transformAnnotationExpression, implicitAs, isSimpleAnnoExprRef } = require('../../model/csnUtils');
+const { transformAnnotationExpression, implicitAs, isSimpleAnnoExprRef } = require('../../base/csnUtils');
 
 /**
  * Used during annotating of foreign keys.
@@ -13,10 +13,10 @@ const { transformAnnotationExpression, implicitAs, isSimpleAnnoExprRef } = requi
  * @param {object} messageFunctions
  * @param {CSN.Path} elementPath
  */
-function adaptAnnotationsRefs(generatedForeignKeys, csnUtils, { error }, elementPath, options) {
+function adaptAnnotationsRefs(generatedForeignKeys, csnUtils, { error }, elementPath) {
   if (Array.isArray(generatedForeignKeys?.[0])) {
     // ensure we are always called with an array of objects. TODO: Cleanup fk creation in for.effective to create array of objects
-    adaptAnnotationsRefs(remapToArrayOfObjects(generatedForeignKeys), csnUtils, { error }, elementPath, options);
+    adaptAnnotationsRefs(remapToArrayOfObjects(generatedForeignKeys), csnUtils, { error }, elementPath);
   }
   else {
     const reportedErrorsForAnnoPath = {};
@@ -49,14 +49,8 @@ function adaptAnnotationsRefs(generatedForeignKeys, csnUtils, { error }, element
               if (gfkForRef.length === 1) {
                 ref[0] = gfkForRef[0].prefix;
 
-                if (ctx?.annoExpr?.['=']) {
-                  // TODO: Apply the same fix for OData once the OData behavior is aligned;
-                  //       when done, the `options` parameter can be removed from this function.
-                  if (options?.transformation === 'effective')
-                    ctx.annoExpr['='] = isSimpleAnnoExprRef(ctx.annoExpr) ? ctx.annoExpr.ref.join('.') : true;
-                  else
-                    ctx.annoExpr['='] = true;
-                }
+                if (ctx?.annoExpr?.['='])
+                  ctx.annoExpr['='] = isSimpleAnnoExprRef(ctx.annoExpr) ? ctx.annoExpr.ref.join('.') : true;
               }
               else {
                 // check if the annotation reference points to a structure that has been expanded,

package/node_modules/@sap/cds-compiler/lib/transform/odata/createForeignKeys.js

@@ -4,7 +4,7 @@ const { isBuiltinType } = require('../../base/builtins');
 const { setProp } = require('../../utils/objectUtils');
 const {
   applyTransformations, implicitAs, copyAnnotations, isDeepEqual,
-} = require('../../model/csnUtils');
+} = require('../../base/csnUtils');
 const { EdmTypeFacetNames } = require('../../edm/EdmPrimitiveTypeDefinitions');
 const { adaptAnnotationsRefs } = require('./adaptAnnotationRefs');
 

package/node_modules/@sap/cds-compiler/lib/transform/odata/flattening.js

@@ -3,8 +3,8 @@
 const {
   forEachDefinition,
   copyAnnotations, forEachMemberRecursively, forEachGeneric,
-  transformExpression, transformAnnotationExpression,
-} = require('../../model/csnUtils');
+  transformExpression, transformAnnotationExpression, isSimpleAnnoExprRef,
+} = require('../../base/csnUtils');
 const { isBuiltinType, isMagicVariable } = require('../../base/builtins');
 const transformUtils = require('../transformUtils');
 const { setProp } = require('../../utils/objectUtils');
@@ -427,7 +427,7 @@ function allInOneFlattening(csn, refFlattener, adaptRefs, inspectRef, getFinalTy
           }
         }
         if (isPrefixed && ctx?.annoExpr?.['='])
-          ctx.annoExpr['='] = true;
+          ctx.annoExpr['='] = isSimpleAnnoExprRef(ctx.annoExpr) ? ctx.annoExpr.ref.join('.') : true;
       },
     };
 
@@ -649,7 +649,7 @@ function getStructRefFlatteningTransformer(csn, inspectRef, effectiveType, optio
         const { annoExpr } = ctx;
         adaptRefs.push((...args) => {
           if (fn(...args))
-            annoExpr['='] = true;
+            annoExpr['='] = isSimpleAnnoExprRef(annoExpr) ? annoExpr.ref.join('.') : true;
         });
       }
       else {

package/node_modules/@sap/cds-compiler/lib/transform/odata/foreignKeyRefsInXprAnnos.js

@@ -1,6 +1,8 @@
 'use strict';
 
-const { applyTransformations, transformAnnotationExpression, implicitAs } = require('../../model/csnUtils');
+const {
+  applyTransformations, transformAnnotationExpression, implicitAs, isSimpleAnnoExprRef,
+} = require('../../base/csnUtils');
 
 
 /**
@@ -37,14 +39,14 @@ function replaceForeignKeyRefsInExpressionAnnotations(csn, csnUtils, iterateOpti
 
         const modifiedRef = replaceRefsWithFKs(ref, links, art);
 
-        // update the ref and string token to true if there was FK replacement
+        // update the ref and string token if there was FK replacement
         if (
           modifiedRef.length !== ref.length ||
           !modifiedRef.every((val, index) => val === ref[index])
         ) {
           parent.ref = modifiedRef;
           if (ctx?.annoExpr?.['='])
-            ctx.annoExpr['='] = true;
+            ctx.annoExpr['='] = isSimpleAnnoExprRef(ctx.annoExpr) ? ctx.annoExpr.ref.join('.') : true;
         }
       },
     },