@sap/cds-compiler 2.10.4 → 2.11.0

package/lib/render/toHdbcds.js

@@ -3,7 +3,7 @@
 const {
   getParentNameOf, getLastPartOf, getLastPartOfRef,
   hasValidSkipOrExists, isBuiltinType, generatedByCompilerVersion, getNormalizedQuery,
-  getRootArtifactName, getResultingName, getNamespace, forEachMember,
+  getRootArtifactName, getResultingName, getNamespace, forEachMember, getVariableReplacement,
 } = require('../model/csnUtils');
 const keywords = require('../base/keywords');
 const {
@@ -17,7 +17,7 @@ const DuplicateChecker = require('./DuplicateChecker');
 const { isDeprecatedEnabled, forEachDefinition } = require('../base/model');
 const { checkCSNVersion } = require('../json/csnVersion');
 const { makeMessageFunction } = require('../base/messages');
-const timetrace = require('../utils/timetrace');
+const { timetrace } = require('../utils/timetrace');
 
 const { smartId, delimitedId } = require('../sql-identifier');
 
@@ -558,7 +558,7 @@ function toHdbcdsSource(csn, options) {
     result += env.indent + (elm.key && !isSubElement ? 'key ' : '') +
                          (elm.masked ? 'masked ' : '') +
                          quotedElementName + (omitColon ? ' ' : ' : ') +
-                         renderTypeReference(elm, env, undefined) +
+                         renderTypeReference(elm, env) +
                          renderNullability(elm);
     if (elm.default)
       result += ` default ${renderExpr(elm.default, env)}`;
@@ -680,7 +680,7 @@ function toHdbcdsSource(csn, options) {
    */
   function renderViewColumn(col, env, element) {
     // Annotations and column
-    let result = element && hasHanaComment(element, options) ? `${env.indent}@Comment: '${getEscapedHanaComment(element)}'\n` : '';
+    let result = '';
 
     const leaf = col.as || col.ref && col.ref[col.ref.length - 1];
     // Render 'null as <alias>' only for database and if element is virtual
@@ -959,7 +959,7 @@ function toHdbcdsSource(csn, options) {
     }
     else {
       // Derived type or annotation with non-anonymous type
-      result += ` : ${renderTypeReference(art, env, false)};\n`;
+      result += ` : ${renderTypeReference(art, env)};\n`;
     }
     return result;
   }
@@ -970,10 +970,9 @@ function toHdbcdsSource(csn, options) {
    *
    * @param {CSN.Element} elm Element using the type reference
    * @param {CdlRenderEnvironment} env Environment
-   * @param {boolean} [noEnum=false] If true, do not render enums
    * @returns {string} Rendered type reference
    */
-  function renderTypeReference(elm, env, noEnum = false) {
+  function renderTypeReference(elm, env) {
     let result = '';
 
     // Array type: Render items instead
@@ -1011,11 +1010,7 @@ function toHdbcdsSource(csn, options) {
     // Reference to another element
     if (elm.type.ref) {
       // For HANA CDS, we need a 'type of'
-      let result = `type of ${renderAbsolutePath(elm.type, env)}`;
-      if (elm.enum)
-        result += renderEnum(elm.enum, env);
-
-      return result;
+      return `type of ${renderAbsolutePath(elm.type, env)}`;
     }
 
     // If we get here, it must be a named type
@@ -1027,8 +1022,6 @@ function toHdbcdsSource(csn, options) {
       // Type names are never flattened (derived types are unraveled in HANA)
       result += renderAbsoluteNameWithQuotes(elm.type, env);
     }
-    if (elm.enum && !noEnum)
-      result += renderEnum(elm.enum, env);
 
     return result;
   }
@@ -1094,27 +1087,6 @@ function toHdbcdsSource(csn, options) {
     return elm.type.replace(/^cds\./, '') + renderTypeParameters(elm);
   }
 
-  /**
-   * Render the 'enum { ... } part of a type declaration
-   *
-   * @param {CSN.EnumElements} enumPart Enum part of a type declaration
-   * @param {CdlRenderEnvironment} env Environment
-   * @returns {string} Rendered enum
-   */
-  function renderEnum(enumPart, env) {
-    let result = ' enum {\n';
-    const childEnv = increaseIndent(env);
-    for (const name in enumPart) {
-      const enumConst = enumPart[name];
-      result += childEnv.indent + quoteId(name);
-      if (enumConst.val !== undefined)
-        result += ` = ${renderExpr(enumConst, childEnv)}`;
-      result += ';\n';
-    }
-    result += `${env.indent}}`;
-    return result;
-  }
-
   /**
    * Render an expression (including paths and values) or condition 'x'.
    * (no trailing LF, don't indent if inline)
@@ -1229,7 +1201,12 @@ function toHdbcdsSource(csn, options) {
      */
     function renderExpressionRef(x) {
       if (!x.param && !x.global) {
+        const magicReplacement = getVariableReplacement(x.ref, options);
         if (x.ref[0] === '$user') {
+          if (magicReplacement !== null)
+            return `'${magicReplacement}'`;
+
+          // Keep old way of solving this to remain backwards compatible
           // FIXME: this is all not enough: we might need an explicit select item alias
           if (x.ref[1] === 'id') {
             if (options.magicVars && options.magicVars.user && (typeof options.magicVars.user === 'string' || options.magicVars.user instanceof String))
@@ -1251,6 +1228,9 @@ function toHdbcdsSource(csn, options) {
           else if (x.ref[1] === 'to')
             return 'TO_TIMESTAMP(SESSION_CONTEXT(\'VALID-TO\'))';
         }
+        else if (x.ref[0] === '$session' && magicReplacement !== null) {
+          return `'${magicReplacement}'`;
+        }
       }
       return `${(x.param || x.global) ? ':' : ''}${x.ref.map((step, index) => renderPathStep(step, index, x.ref)).join('.')}`;
     }
@@ -1262,7 +1242,7 @@ function toHdbcdsSource(csn, options) {
      * @returns {string} Rendered cast()
      */
     function renderExplicitTypeCast(value) {
-      let typeRef = renderTypeReference(x.cast, env, true);
+      let typeRef = renderTypeReference(x.cast, env);
 
       // inside a cast expression, the cds and hana cds types need to be mapped to hana sql types
       const hanaSqlType = cdsToSqlTypes.hana[x.cast.type] || cdsToSqlTypes.standard[x.cast.type];

package/lib/render/toSql.js

@@ -4,7 +4,7 @@
 const {
   getLastPartOf, getLastPartOfRef,
   hasValidSkipOrExists, isBuiltinType, generatedByCompilerVersion, getNormalizedQuery,
-  forEachDefinition, getResultingName,
+  forEachDefinition, getResultingName, getVariableReplacement,
 } = require('../model/csnUtils');
 const {
   renderFunc, beautifyExprArray, cdsToSqlTypes, getHanaComment, hasHanaComment,
@@ -15,7 +15,7 @@ const {
 const DuplicateChecker = require('./DuplicateChecker');
 const { checkCSNVersion } = require('../json/csnVersion');
 const { makeMessageFunction } = require('../base/messages');
-const timetrace = require('../utils/timetrace');
+const { timetrace } = require('../utils/timetrace');
 const { isBetaEnabled, isDeprecatedEnabled } = require('../base/model');
 const { smartFuncId } = require('../sql-identifier');
 const { sortCsn } = require('../json/to-csn');
@@ -567,7 +567,7 @@ function toSqlDdl(csn, options) {
     if (options.toSql.dialect === 'hana')
       renderIndexesInto(art.technicalConfig && art.technicalConfig.hana.indexes, artifactName, resultObj, env);
 
-    if (options.toSql.dialect === 'hana' && hasHanaComment(art, options, art))
+    if (options.toSql.dialect === 'hana' && hasHanaComment(art, options))
       result += ` COMMENT '${getHanaComment(art)}'`;
 
     resultObj.hdbtable[artifactName] = result;
@@ -1054,7 +1054,7 @@ function toSqlDdl(csn, options) {
     definitionsDuplicateChecker.addArtifact(art['@cds.persistence.name'], art && art.$location, artifactName);
     let result = `VIEW ${viewName}`;
 
-    if (options.toSql.dialect === 'hana' && hasHanaComment(art, options, art))
+    if (options.toSql.dialect === 'hana' && hasHanaComment(art, options))
       result += ` COMMENT '${getHanaComment(art)}'`;
 
     result += renderParameterDefinitions(artifactName, art.params);
@@ -1383,6 +1383,8 @@ function toSqlDdl(csn, options) {
       // Function call, possibly with args (use '=>' for named args)
       else if (x.func) {
         const funcName = smartFuncId(prepareIdentifier(x.func), options.toSql.dialect);
+        if (x.xpr)
+          return renderWindowFunction(funcName, x, env);
         return renderFunc(funcName, x, options.toSql.dialect, a => renderArgs(a, '=>', env, null));
       }
       // Nested expression
@@ -1405,6 +1407,13 @@ function toSqlDdl(csn, options) {
       throw new Error(`Unknown expression: ${JSON.stringify(x)}`);
     }
 
+    function renderWindowFunction(funcName, node, env) {
+      const suffix = node.xpr.shift(); // OVER
+      let r = `${funcName}(${renderArgs(node, '=>', env, null)})`;
+      r += ` ${suffix} (${renderExpr(node.xpr, env)})`;
+      return r;
+    }
+
     function renderExpressionLiteral(x) {
       // Literal value, possibly with explicit 'literal' property
       switch (x.literal || typeof x.val) {
@@ -1441,7 +1450,12 @@ function toSqlDdl(csn, options) {
 
     function renderExpressionRef(x) {
       if (!x.param && !x.global) {
+        const magicReplacement = getVariableReplacement(x.ref, options);
+
         if (x.ref[0] === '$user') {
+          if (magicReplacement !== null)
+            return `'${magicReplacement}'`;
+
           const result = render$user(x);
           // Invalid second path step doesn't cause a return
           if (result)
@@ -1453,6 +1467,9 @@ function toSqlDdl(csn, options) {
           if (result)
             return result;
         }
+        else if (x.ref[0] === '$session' && magicReplacement !== null) {
+          return `'${magicReplacement}'`;
+        }
       }
       // FIXME: We currently cannot distinguish whether '$parameters' was quoted or not - we
       // assume that it was not if the path has length 2 (
@@ -1475,6 +1492,7 @@ function toSqlDdl(csn, options) {
     function render$user(x) {
       // FIXME: this is all not enough: we might need an explicit select item alias
       if (x.ref[1] === 'id') {
+        // Keep the old-style for compatibilty with magicVars.id - instead of magicVars.user.id...
         if (options.toSql.user && typeof options.toSql.user === 'string' || options.toSql.user instanceof String)
           return `'${options.toSql.user}'`;
 
@@ -1494,7 +1512,7 @@ function toSqlDdl(csn, options) {
         }
         return 'SESSION_CONTEXT(\'LOCALE\')';
       }
-      // Basically: Second path step was invalid, do nothing
+      // Basically: Second path step was invalid, do nothing - should not happen, see 'unknownMagic.js'
       return null;
     }
     /**