@sap/cds-compiler 6.9.3 → 7.0.1

package/lib/transform/db/views.js

@@ -61,58 +61,20 @@ function usesMixinAssociation( query, association, associationName ) {
 /**
  * @param {CSN.Model} csn
  * @param {CSN.Options} options
- * @param {{error: Function, info: Function}} messageFunctions
+ * @param {{error: Function, info: Function}} _messageFunctions
  * @returns {(query: CSN.Query, artifact: CSN.Artifact, artName: string, path: CSN.Path) => void} Transformer function for views
  */
-function getViewTransformer( csn, options, messageFunctions ) {
+function getViewTransformer( csn, options, _messageFunctions ) {
   const csnUtils = getUtils(csn);
   const {
-    get$combined, isAssocOrComposition,
+    get$combined,
     inspectRef, queryOrMain, // csnRefs
   } = csnUtils;
-  const { error, info } = messageFunctions;
-  const doA2J = !(options.transformation === 'hdbcds' && options.sqlMapping === 'hdbcds');
 
   return transformViewOrEntity;
 
   /**
-   *
-   * check all queries/subqueries for mixin publishing inside of unions -> forbidden in hdbcds
-   *
-   * @param {CSN.Query} query
-   * @param {CSN.Elements} elements
-   * @param {CSN.Path} path
    */
-  function checkForMixinPublishing( query, elements, path ) {
-    for (const elementName in elements) {
-      const element = elements[elementName];
-      if (element.target) {
-        let colLocation;
-        for (let i = 0; i < query.SELECT.columns.length; i++) {
-          const col = query.SELECT.columns[i];
-          if (col.ref && col.ref.length === 1) {
-            if (!colLocation && col.ref[0] === elementName)
-              colLocation = i;
-
-
-            if (col.as === elementName)
-              colLocation = i;
-          }
-        }
-        if (colLocation) {
-          const matchingCol = query.SELECT.columns[colLocation];
-          const possibleMixinName = matchingCol.ref[0];
-          const isMixin = query.SELECT.mixin[possibleMixinName] !== undefined;
-          if (element.target && isMixin) {
-            error(null, path.concat([ 'columns', colLocation ]), { id: elementName, name: possibleMixinName, '#': possibleMixinName === elementName ? 'std' : 'renamed' }, {
-              std: 'Element $(ID) is a mixin association and can\'t be published in a UNION',
-              renamed: 'Element $(ID) is a mixin association ($(NAME))and can\'t be published in a UNION',
-            });
-          }
-        }
-      }
-    }
-  }
 
   /**
    * For things that are not explicitly found in the columns but still present in the elements, add them to the columnMap.
@@ -158,8 +120,7 @@ function getViewTransformer( csn, options, messageFunctions ) {
   }
 
   /**
-   * Check for invalid association publishing (in Union or in Subquery) (for hdbcds) and
-   * create the __clone for publishing stuff.
+   * Create the __clone for publishing association elements.
    *
    * @todo Factor out the checks
    * @param {CSN.Query} query
@@ -169,95 +130,63 @@ function getViewTransformer( csn, options, messageFunctions ) {
    * @param {CSN.Element} elem
    * @param {string} elemName
    * @param {CSN.Path} elementsPath Path pointing to elements
-   * @param {CSN.Path} queryPath Path pointing to the query
    */
-  function handleAssociationElement( query, elements, columnMap, publishedMixins, elem, elemName, elementsPath, queryPath ) {
-    if (isUnion(queryPath) && options.transformation === 'hdbcds') {
-      if (doA2J) {
-        info('query-ignoring-assoc-in-union', queryPath, { name: elemName, '#': elem.keys ? 'managed' : 'std' });
-        elem.$ignore = true;
-      }
-      else {
-        error(null, queryPath, { name: elemName }, 'Association $(NAME) can\'t be published in a SAP HANA CDS UNION');
-      }
-    }
-    else if (queryPath.length > 4 && options.transformation === 'hdbcds') { // path.length > 4 -> is a subquery
-      error(null, queryPath, { name: elemName },
-            'Association $(NAME) can\'t be published in a subquery');
-    }
-    else {
-      const isNotMixinByItself = checkIsNotMixinByItself(query, columnMap, elemName);
-      const { mixinElement, mixinName } = getMixinAssocOfQueryIfPublished(query, elem, elemName);
-      if (isNotMixinByItself || mixinElement !== undefined) {
-        // If the mixin is only published and not used, only display the __ clone. Kill the "original".
-        if (mixinElement !== undefined && !usesMixinAssociation(query, elem, elemName))
-          delete query.SELECT.mixin[mixinName];
-
-
-        // Create an unused alias name for the MIXIN - use 3 _ to avoid collision with usings
-        let mixinElemName = `___${ mixinName || elemName }`;
-        while (elements[mixinElemName])
-          mixinElemName = `_${ mixinElemName }`;
-
-        // Copy the association element to the MIXIN clause under its alias name
-        // Needs to be a deep copy, as we transform the on-condition
-        const mixinElem = cloneCsnNonDict(elem, options);
-
-        if (query.SELECT && !query.SELECT.mixin)
-          query.SELECT.mixin = Object.create(null);
-
-        // Clone 'on'-condition, pre-pending '$projection' to paths where appropriate,
-        // and fixing the association alias just created
-
-        if (mixinElem.on) {
-          mixinElem.on = applyTransformationsOnNonDictionary(mixinElem, 'on', {
-            ref: (parent, prop, ref, refpath) => {
-              if (ref[0] === elemName) {
-                ref[0] = mixinElemName;
-              }
-              else if (!(ref[0] && ref[0].startsWith('$'))) {
+  function handleAssociationElement( query, elements, columnMap, publishedMixins, elem, elemName, elementsPath, _queryPath ) {
+    const isNotMixinByItself = checkIsNotMixinByItself(query, columnMap, elemName);
+    const { mixinElement, mixinName } = getMixinAssocOfQueryIfPublished(query, elem, elemName);
+    if (isNotMixinByItself || mixinElement !== undefined) {
+      // If the mixin is only published and not used, only display the __ clone. Kill the "original".
+      if (mixinElement !== undefined && !usesMixinAssociation(query, elem, elemName))
+        delete query.SELECT.mixin[mixinName];
+
+
+      // Create an unused alias name for the MIXIN - use 3 _ to avoid collision with usings
+      let mixinElemName = `___${ mixinName || elemName }`;
+      while (elements[mixinElemName])
+        mixinElemName = `_${ mixinElemName }`;
+
+      // Copy the association element to the MIXIN clause under its alias name
+      // Needs to be a deep copy, as we transform the on-condition
+      const mixinElem = cloneCsnNonDict(elem, options);
+
+      if (query.SELECT && !query.SELECT.mixin)
+        query.SELECT.mixin = Object.create(null);
+
+      // Clone 'on'-condition, pre-pending '$projection' to paths where appropriate,
+      // and fixing the association alias just created
+
+      if (mixinElem.on) {
+        mixinElem.on = applyTransformationsOnNonDictionary(mixinElem, 'on', {
+          ref: (parent, prop, ref, refpath) => {
+            if (ref[0] === elemName) {
+              ref[0] = mixinElemName;
+            }
+            else if (!(ref[0] && ref[0].startsWith('$'))) {
+              ref.unshift('$projection');
+            }
+            else if (ref[0] && ref[0].startsWith('$')) {
+              // TODO: I think this is non-sense. Stuff with $ is either magic or must start with $self, right?
+              const { scope } = inspectRef(refpath);
+              if (scope !== '$magic' && scope !== '$self')
                 ref.unshift('$projection');
-              }
-              else if (ref[0] && ref[0].startsWith('$')) {
-                // TODO: I think this is non-sense. Stuff with $ is either magic or must start with $self, right?
-                const { scope } = inspectRef(refpath);
-                if (scope !== '$magic' && scope !== '$self')
-                  ref.unshift('$projection');
-              }
-              parent.ref = ref;
-              return ref;
-            },
-          }, {}, elementsPath.concat(elemName));
-        }
+            }
+            parent.ref = ref;
+            return ref;
+          },
+        }, {}, elementsPath.concat(elemName));
+      }
 
-        if (!mixinElem.$ignore)
-          columnMap[elemName] = { ref: [ mixinElemName ], as: elemName };
+      if (!mixinElem.$ignore)
+        columnMap[elemName] = { ref: [ mixinElemName ], as: elemName };
 
-        if (query.SELECT) {
-          query.SELECT.mixin[mixinElemName] = mixinElem;
+      if (query.SELECT) {
+        query.SELECT.mixin[mixinElemName] = mixinElem;
 
-          publishedMixins.set(mixinElem, true);
-        }
+        publishedMixins.set(mixinElem, true);
       }
     }
   }
 
-  /**
-   * If following an association, explicitly set the implicit alias
-   * due to an issue with HANA - only for hdbcds-hdbcds, I assume flattening
-   * takes care of this for the other cases already
-   *
-   * @param {CSN.Column} col
-   * @param {CSN.Path} path
-   */
-  function addImplicitAliasWithAssoc( col, path ) {
-    if (!col.as && col.ref && col.ref.length > 1) {
-      const { links } = inspectRef(path);
-      if (links && links.slice(0, -1).some(({ art }) => art && isAssocOrComposition(art)))
-        col.as = getLastRefStepString(col.ref);
-    }
-  }
-
   /**
    * If simply selecting from a param like `:param`, we need to add an implicit alias like `:param as param`
    * due to an issue with HANA
@@ -298,16 +227,11 @@ function getViewTransformer( csn, options, messageFunctions ) {
     const elementsPath = elements === artifact.elements ? path.slice(0, 2).concat('elements') : path.concat('elements');
     const queryPath = path;
 
-    let hasNonAssocElements = false;
     const isSelect = query && query.SELECT;
     const isProjection = !!artifact.projection || query && query.SELECT && !query.SELECT.columns;
     const columnMap = getColumnMap(query, csnUtils);
     const isSelectStar = query && query.SELECT && query.SELECT.columns && query.SELECT.columns.indexOf('*') !== -1;
 
-    // check all queries/subqueries for mixin publishing inside of unions -> forbidden in hdbcds
-    if (query && options.transformation === 'hdbcds' && query.SELECT && query.SELECT.mixin && path.indexOf('SET') !== -1)
-      checkForMixinPublishing(query, elements, path);
-
     // 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;
@@ -321,9 +245,6 @@ function getViewTransformer( csn, options, messageFunctions ) {
         if (!columnMap[elemName])
           addProjectionOrStarElement(query, isProjection, isSelectStar, $combined, columnMap, elemName);
       }
-      // Views must have at least one element that is not an unmanaged assoc
-      if (!elem.on && !elem.$ignore)
-        hasNonAssocElements = true;
 
       // (180 b) Create MIXINs for association elements in projections or views (those that are not mixins by themselves)
       // CDXCORE-585: Allow mixin associations to be used and published in parallel
@@ -331,21 +252,14 @@ function getViewTransformer( csn, options, messageFunctions ) {
         handleAssociationElement(query, elements, columnMap, publishedMixins, elem, elemName, elementsPath, queryPath);
     }
 
-    if (query && !hasNonAssocElements) {
-      // Complain if there are no elements other than unmanaged associations or associations without keys.
-      error('def-missing-element', [ 'definitions', artName ], { '#': 'view' });
-    }
-
     if (isSelect) {
       // Build new columns from the column map - bring elements and columns back in sync basically
       query.SELECT.columns = Object.keys(elements).filter(elem => !elements[elem].$ignore && !(elements[elem].target && ignoreAssociations)).map(key => stripLeadingSelf(columnMap[key]));
       // If following an association, explicitly set the implicit alias
       // due to an issue with HANA - this seems to only have an effect on ref files with hdbcds-hdbcds, so only run then
       const columnProcessors = [];
-      if (options.transformation === 'hdbcds' || options.transformation === 'sql' && options.sqlDialect === 'hana')
+      if (options.transformation === 'sql' && options.sqlDialect === 'hana')
         columnProcessors.push(addImplicitAliasWithLonelyParam);
-      if (options.transformation === 'hdbcds' && options.sqlMapping === 'hdbcds')
-        columnProcessors.push(addImplicitAliasWithAssoc);
 
       if (columnProcessors.length > 0)
         processColumns(columnProcessors, query.SELECT.columns, path.concat('columns'));
@@ -353,7 +267,7 @@ function getViewTransformer( csn, options, messageFunctions ) {
       delete query.SELECT.excluding;  // just to make the output of the new transformer the same as the old
 
       // A2J turned usages into JOINs, we must now remove all non-published mixins (i.e. only keep the clones)
-      if (query.SELECT.mixin && doA2J) {
+      if (query.SELECT.mixin) {
         for (const [ name, mixin ] of Object.entries(query.SELECT.mixin)) {
           if (!publishedMixins.has(mixin))
             delete query.SELECT.mixin[name];
@@ -363,21 +277,6 @@ function getViewTransformer( csn, options, messageFunctions ) {
   }
 }
 
-/**
- * Walk the given path and check if we are in a UNION.
- * This will return true when it is called on the subquery inside of a SET.args property.
- *
- * @param {CSN.Path} path
- * @returns {boolean}
- */
-function isUnion( path ) {
-  const subquery = path[path.length - 1];
-  const queryIndex = path[path.length - 2];
-  const args = path[path.length - 3];
-  const unionOperator = path[path.length - 4];
-  return path.length > 3 && (subquery === 'SET' || subquery === 'SELECT') && typeof queryIndex === 'number' && queryIndex >= 0 && args === 'args' && unionOperator === 'SET';
-}
-
 /**
  * Strip of leading $self of the ref
  *
@@ -487,16 +386,13 @@ function getColumnMap( query, csnUtils ) {
  *
  * @param {object} query
  * @param {object} csnUtils
- * @param {CSN.Options} options
+ * @param {CSN.Options} _options
  */
-function ensureColumnNames( query, csnUtils, options ) {
+function ensureColumnNames( query, csnUtils, _options ) {
   const select = query.SELECT || query.projection;
   for (const col of select?.columns || []) {
     if (col !== '*' && !columnAlias(col)) {
-      if (options.transformation === 'hdbcds')
-        col.as = csnUtils.getColumnName(col);
-      else
-        setProp(col, 'as', csnUtils.getColumnName(col));
+      setProp(col, 'as', csnUtils.getColumnName(col));
     }
   }
 }

package/lib/transform/draft/db.js

@@ -239,7 +239,7 @@ function generateDrafts( csn, options, pathDelimiter, messageFunctions ) {
     // Note that we may need to do the HANA transformation steps for managed associations
     // (foreign key field generation, generatedFieldName, creating ON-condition) by hand,
     // because the corresponding transformation steps have already been done on all artifacts
-    // when we come here). Only for to.hdbcds with hdbcds names this is not required.
+    // when we come here).
     /**
      * The given association has a key named DraftUUID
      *
@@ -273,7 +273,7 @@ function generateDrafts( csn, options, pathDelimiter, messageFunctions ) {
     }
 
     const draftUUIDKey = getDraftUUIDKey(draftAdministrativeData.DraftAdministrativeData);
-    if (!(options.transformation === 'hdbcds' && options.sqlMapping === 'hdbcds') && draftUUIDKey) {
+    if (draftUUIDKey) {
       const source = csn.definitions[draftAdministrativeData.DraftAdministrativeData.target];
       const sourceElement = source.elements[draftUUIDKey.ref[0]];
       const targetElement = {};

package/lib/transform/forOdata.js

@@ -33,7 +33,7 @@ const { addLocalizationViews } = require('./localized');
 const { cloneFullCsn } = require('../base/cloneCsn');
 const { csnRefs } = require('../base/csnRefs');
 const replaceForeignKeyRefsInExpressionAnnotations = require('./odata/foreignKeyRefsInXprAnnos');
-const { isAnnotationExpression, primaryExprProperties } = require('../base/builtins');
+const { isAnnotationExpression, primaryExprProperties, isBuiltinType } = require('../base/builtins');
 
 // Transformation for ODATA. Expects a CSN 'inputModel', processes it for ODATA.
 // The result should be suitable for consumption by EDMX processors (annotations and metadata)
@@ -70,8 +70,9 @@ const { isAnnotationExpression, primaryExprProperties } = require('../base/built
 //     (EdmPreproc candidate, check with RT if @Core.Computed required by them)
 //   - Rename shorthand annotations according to a builtin list (EdmPreproc Candidate)
 //       e.g. @label -> @Common.Label
-//   - If the association target is annotated with @cds.odata.valuelist, annotate the
-//        association with @Common.ValueList.viaAssociation (EdmPreproc Candidate)
+//   - For managed associations with a target that is annotated with @cds.odata.valuelist: annotate the
+//        association with @Common.ValueList.viaAssociation. Must happen before "flattening" so that
+//        the annotation is copied to the FKs .(EdmPreproc Candidate)
 //   - Check for @Analytics.Measure and @Aggregation.default (Linter check candidate, remove)
 //   - Check annotations. If annotation starts with '@sap...' it must have a string or boolean value
 //     (Linter check candidate)
@@ -230,7 +231,7 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
       = flattening.getStructRefFlatteningTransformer(csn, inspectRef, effectiveType, options, resolved, '_');
 
     const allMgdAssocDefs = flattening.allInOneFlattening(csn, refFlattener, adaptRefs,
-                                                          inspectRef, getFinalTypeInfo, isExternalServiceMember, error, csnUtils, options);
+                                                          inspectRef, getFinalTypeInfo, isExternalServiceMember, messageFunctions, csnUtils, options);
     flattening.flattenAllStructStepsInRefs(csn, refFlattener, adaptRefs,
                                            inspectRef, effectiveType, csnUtils, error, options,
                                            { // skip: ['action', 'aspect', 'event', 'function', 'type'],
@@ -317,7 +318,7 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
     // hana to allow naming mode "hdbcds"
       def['@cds.persistence.name'] = getArtifactDatabaseNameOf(defName, options.sqlMapping, csn, 'hana');
 
-    forEachMemberRecursively(def, (member, memberName, propertyName) => {
+    forEachMemberRecursively(def, (member, memberName, propertyName, path) => {
       // Annotate elements, foreign keys, parameters, etc. with their DB names if requested
       // Only these are actually required and don't annotate virtual elements in entities or types
       // as they have no DB representation (although in views)
@@ -330,6 +331,9 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
                                                                     memberName, options.sqlMapping, 'hana'); // hana to allow "hdbcds"
       }
 
+
+      checkForComplexTypesWithDefaultValues(member, memberName, path);
+
       processDynamicFieldControlAnnotations(member);
 
       // Mark fields with @odata.on.insert/update as @Core.Computed
@@ -383,6 +387,14 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
   //--------------------------------------------------------------------
   // HELPER SECTION STARTS HERE
 
+
+  // in structured OData, elements which are structured are not allowed to have default values
+  function checkForComplexTypesWithDefaultValues(member, memberName, path) {
+    const resolvedType = getFinalTypeInfo(member.type);
+    if (structuredOData && !isBuiltinType(resolvedType?.type) && member.default !== undefined)
+      error('odata-unexpected-default-struct', path, { name: memberName });
+  }
+
   // Transform @readonly/@mandatory/@disabled into @Common.FieldControl annotation
   // with a when/then/else expression consisting of the input from the annotations.
   function processDynamicFieldControlAnnotations(node) {
@@ -406,7 +418,6 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
     };
 
     const fieldControl = {
-      '=': true,
       xpr: createFieldControlExpression(definedAnnotations),
     };
 
@@ -591,12 +602,12 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
 
     if (shouldSet(minVal)) {
       setAnnotation(node, '@Validation.Minimum', minVal);
-      if (min['='] !== undefined)
+      if (typeof min === 'object' && min.val !== undefined)
         setAnnotation(node, '@Validation.Minimum.@Validation.Exclusive', true);
     }
     if (shouldSet(maxVal)) {
       setAnnotation(node, '@Validation.Maximum', maxVal);
-      if (max['='] !== undefined)
+      if (typeof max === 'object' && max.val !== undefined)
         setAnnotation(node, '@Validation.Maximum.@Validation.Exclusive', true);
     }
   }
@@ -653,17 +664,17 @@ function transform4odataWithCsn(inputModel, options, messageFunctions) {
     }
   }
 
-  // (4.5) If the member is an association whose target has @cds.odata.valuelist annotate it
-  // with @Common.ValueList.viaAssociation.
-  // Do this only if the association is navigable(@odata.navigable) and the enclosing artifact is
-  // a service member (don't pollute the CSN with unnecessary annotations, that is ensured by the caller
-  // of this function).
+  // If member is a managed association whose target has @cds.odata.valuelist
+  // and that is navigable (@odata.navigable), then annotate it with @Common.ValueList.viaAssociation.
+  // During flattening the anno will be copied to the association's FKs.
+  // Don't add anno to unmanaged assocs, as value list annotation only applies to Property, not NavProperty
   function addCommonValueListviaAssociation(member, memberName) {
     const vlAnno = '@Common.ValueList.viaAssociation';
     if (isAssociation(member)) {
+      const managed = member.on === undefined;
       const navigable = member['@odata.navigable'] !== false; // navigable disabled only if explicitly set to false
       const targetDef = getCsnDef(member.target);
-      if (navigable && targetDef['@cds.odata.valuelist'] && !member[vlAnno])
+      if (managed && navigable && targetDef['@cds.odata.valuelist'] && !member[vlAnno])
         setAnnotation(member, vlAnno, { '=': memberName });
     }
   }