@sap/cds-compiler 3.5.2 → 3.5.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 3.5.4 - 2023-01-10
+
+### Fixed
+
+- Allow window functions also with a deprecated flag being set.
+- to.edm(x): Fix program abort due to malformed error location in EDM annotation preprocessing.
+- to.sql/hdi/hdbcds: The option `pre2134ReferentialConstraintNames` can be used to omit the referential constraint identifier prefix "c__".
+
 ## Version 3.5.2 - 2022-12-20
 
 ### Fixed

package/lib/api/options.js

@@ -27,6 +27,7 @@ const publicOptionsNewAPI = [
   'joinfk',
   'magicVars', // deprecated, not removed in v3 as we have specific error messages for it
   'variableReplacements',
+  'pre2134ReferentialConstraintNames',
   // ODATA
   'odataVersion',
   'odataFormat',

package/lib/base/model.js

@@ -37,6 +37,30 @@ const availableBetaFlags = {
   nestedServices: false,
 };
 
+const availableDeprecatedFlags = {
+  // the old ones starting with _, : false
+  autoCorrectOrderBySourceRefs: true,
+  eagerPersistenceForGeneratedEntities: true,
+}
+
+const oldDeprecatedFlags_v2 = [
+  'createLocalizedViews',
+  'downgradableErrors',
+  'generatedEntityNameWithUnderscore',
+  'longAutoexposed',
+  'noElementsExpansion',
+  'noInheritedAutoexposeViaComposition',
+  'noScopedRedirections',
+  'oldVirtualNotNullPropagation',
+  'parensAsStrings',
+  'projectionAsQuery',
+  'redirectInSubQueries',
+  'renderVirtualElements',
+  'shortAutoexposed',
+  'unmanagedUpInComponent',
+  'v1KeysForTemporal',
+];
+
 /**
  * Test for early-adaptor feature, stored in option `beta`(new-style) / `betaMode`(old-style)
  * With that, the value of `beta` is a dictionary of feature=>Boolean.
@@ -59,7 +83,11 @@ function isBetaEnabled( options, feature ) {
 /**
  * Test for deprecated feature, stored in option `deprecated`.
  * With that, the value of `deprecated` is a dictionary of feature=>Boolean.
- * If no `feature` is provided, checks if any deprecated option is set.
+ *
+ * If no `feature` is provided, checks if any deprecated option is set
+ * which is not mentioned in availableDeprecatedFlags with value true.
+ * Useful for newer functionality which might not work with some
+ * deprecated feature turned on.
  *
  * Please do not move this function to the "option processor" code.
  *
@@ -69,30 +97,13 @@ function isBetaEnabled( options, feature ) {
  */
 function isDeprecatedEnabled( options, feature = null ) {
   const { deprecated } = options;
-  if (!feature)
-    return !!deprecated;
-
+  if (!feature) {
+    return !!deprecated && Object.keys( deprecated )
+      .some( d => !availableDeprecatedFlags[d] );
+  }
   return deprecated && typeof deprecated === 'object' && deprecated[feature];
 }
 
-const oldDeprecatedFlags_v2 = [
-  'createLocalizedViews',
-  'downgradableErrors',
-  'generatedEntityNameWithUnderscore',
-  'longAutoexposed',
-  'noElementsExpansion',
-  'noInheritedAutoexposeViaComposition',
-  'noScopedRedirections',
-  'oldVirtualNotNullPropagation',
-  'parensAsStrings',
-  'projectionAsQuery',
-  'redirectInSubQueries',
-  'renderVirtualElements',
-  'shortAutoexposed',
-  'unmanagedUpInComponent',
-  'v1KeysForTemporal',
-];
-
 /**
  * In cds-compiler v3, we removed old v2 deprecated flags.  That can lead to silent
  * errors such as entity/view names changing.  To ensure that the user is forced

package/lib/compiler/resolve.js

@@ -39,7 +39,6 @@
 'use strict';
 
 const {
-  isDeprecatedEnabled,
   forEachDefinition,
   forEachMember,
   forEachGeneric,
@@ -80,7 +79,7 @@ const $inferred = Symbol.for('cds.$inferred');
 // exception in case of an error, but push the corresponding error object to
 // that property (should be a vector).
 function resolve( model ) {
-  const { options } = model;
+  // const { options } = model;
   // Get shared functionality and the message function:
   const {
     info, warning, error, message,
@@ -1328,11 +1327,6 @@ function resolve( model ) {
       const args = Array.isArray(expr.args) ? expr.args : Object.values( expr.args );
       args.forEach( e => e && resolveExpr( e, e.$expected || expected, user, extDict ) );
     }
-    if (expr.suffix && isDeprecatedEnabled( options )) {
-      const { location } = expr.suffix[0] || expr;
-      error( null, [ location, user ], { prop: 'deprecated' },
-             'Window functions are not supported if $(PROP) options are set' );
-    }
     if (expr.suffix)
       expr.suffix.forEach( s => s && resolveExpr( s, expected, user, extDict ) );
   }

package/lib/edm/annotations/preprocessAnnotations.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { makeMessageFunction } = require('../../base/messages.js');
-const { forEachDefinition } = require('../../model/csnUtils.js');
+const { forEachDefinition, forEachGeneric } = require('../../model/csnUtils.js');
 
 
 /**************************************************************************************************
@@ -66,9 +66,9 @@ function preprocessAnnotations(csn, serviceName, options) {
         artifact.elements && Object.entries(artifact.elements).forEach(([elementName, element]) => {
           handleAnnotations(elementName, element, [ ...location, 'elements', elementName ]);
         });
-        artifact.actions && Object.values(artifact.actions).forEach(action => {
+        forEachGeneric(artifact, 'actions', (action, actionName) => {
           action.params && Object.entries(action.params).forEach(([paramName, param]) => {
-            handleAnnotations(paramName, param, [ ...location, 'actions', action, 'params', paramName ]);
+            handleAnnotations(paramName, param, [ ...location, 'actions', actionName, 'params', paramName ]);
           });
         });
       }

package/lib/optionProcessor.js

@@ -166,6 +166,7 @@ optionProcessor.command('H, toHana')
   .option('    --integrity-not-enforced')
   .option('    --assert-integrity <mode>', ['true', 'false', 'individual'])
   .option('    --assert-integrity-type <type>', ['RT', 'DB'], { ignoreCase: true })
+  .option('    --pre2134ReferentialConstraintNames')
   .option('    --disable-hana-comments')
   .help(`
   Usage: cdsc toHana [options] <files...>
@@ -201,6 +202,7 @@ optionProcessor.command('H, toHana')
                                            RT : (default) No database constraint for an association
                                                if not explicitly demanded via annotation
                                            DB : Create database constraints for associations
+   --pre2134ReferentialConstraintNames   Do not prefix the constraint identifier with "c__"
    --disable-hana-comments    Disable rendering of doc comments as SAP HANA comments.
 `);
 
@@ -280,6 +282,7 @@ optionProcessor.command('Q, toSql')
   .option('    --assert-integrity <mode>', ['true', 'false', 'individual'])
   .option('    --assert-integrity-type <type>', ['RT', 'DB'], { ignoreCase: true })
   .option('    --constraints-in-create-table')
+  .option('    --pre2134ReferentialConstraintNames')
   .option('    --disable-hana-comments')
   .help(`
   Usage: cdsc toSql [options] <files...>
@@ -329,6 +332,7 @@ optionProcessor.command('Q, toSql')
    --constraints-in-create-table    If set, the foreign key constraints will be rendered as
                                     part of the "CREATE TABLE" statements rather than as separate
                                     "ALTER TABLE ADD CONSTRAINT" statements
+   --pre2134ReferentialConstraintNames   Do not prefix the constraint identifier with "c__"
    --disable-hana-comments    Disable rendering of doc comments as SAP HANA comments.
 `);
 

package/lib/render/toHdbcds.js

@@ -146,7 +146,7 @@ function toHdbcdsSource( csn, options ) {
       Object.entries(art.$tableConstraints.referential)
         .forEach(([ fileName, referentialConstraint ]) => {
           referentialConstraints[fileName] = renderReferentialConstraint(
-            referentialConstraint, '', renderToUppercase, csn, options
+            referentialConstraint, increaseIndent(createEnv()).indent, renderToUppercase, csn, options
           );
         });
       Object.entries(referentialConstraints)

package/lib/render/utils/sql.js

@@ -65,8 +65,7 @@ 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
-  // Does not include HDBCDS.
-  if (options.toSql && sqlDialect !== 'sqlite' && sqlDialect !== 'postgres') {
+  if (options.transformation === 'hdbcds' || (options.toSql && sqlDialect !== 'sqlite' && sqlDialect !== 'postgres')) {
     result += `${indent}${!constraint.validated ? 'NOT ' : ''}VALIDATED\n`;
     result += `${indent}${!constraint.enforced ? 'NOT ' : ''}ENFORCED\n`;
   }

package/lib/transform/db/constraints.js

@@ -515,9 +515,11 @@ function createReferentialConstraints( csn, options ) {
       // comments in sqlite files are causing the JDBC driver to throw an error on deployment
       if (options.testMode && onDelete === 'CASCADE')
         onDeleteRemark = `Up_ link for Composition "${$foreignKeyConstraint.upLinkFor}" implies existential dependency`;
+      // constraint identifier usually start with `c__` to avoid name clashes
+      let identifier = options.pre2134ReferentialConstraintNames ? '' : 'c__';
+      identifier += `${getResultingName(csn, options.sqlMapping, artifactName)}_${$foreignKeyConstraint.sourceAssociation}`;
       referentialConstraints[`${getResultingName(csn, 'quoted', artifactName)}_${$foreignKeyConstraint.sourceAssociation}`] = {
-        // constraint identifier start with `c__` to avoid name clashes
-        identifier: `c__${getResultingName(csn, options.sqlMapping, artifactName)}_${$foreignKeyConstraint.sourceAssociation}`,
+        identifier,
         foreignKey: dependentKey,
         parentKey,
         dependentTable: artifactName,

package/package.json

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