@sap/cds-compiler 2.7.0 → 2.11.2

package/lib/render/toSql.js

@@ -4,10 +4,10 @@
 const {
   getLastPartOf, getLastPartOfRef,
   hasValidSkipOrExists, isBuiltinType, generatedByCompilerVersion, getNormalizedQuery,
-  forEachDefinition, getResultingName,
+  forEachDefinition, getResultingName, getVariableReplacement,
 } = require('../model/csnUtils');
 const {
-  renderFunc, processExprArray, cdsToSqlTypes, getHanaComment, hasHanaComment,
+  renderFunc, beautifyExprArray, cdsToSqlTypes, getHanaComment, hasHanaComment,
 } = require('./utils/common');
 const {
   renderReferentialConstraint, getIdentifierUtils,
@@ -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');
@@ -385,7 +385,7 @@ function toSqlDdl(csn, options) {
     function reducesTypeSize(def) {
       // HANA does not allow decreasing the value of any of those type parameters.
       return def.old.type === def.new.type &&
-          [ 'length', 'precision', 'scale' ].some(param => def.new[param] < def.old[param]);
+        [ 'length', 'precision', 'scale' ].some(param => def.new[param] < def.old[param]);
     }
     function getEltStr(defVariant, eltName) {
       return defVariant.target
@@ -525,12 +525,12 @@ function toSqlDdl(csn, options) {
           referentialConstraints[fileName] = renderReferentialConstraint(referentialConstraint, childEnv.indent, false, csn, options);
         });
       if (renderReferentialConstraintsAsHdbconstraint) {
-        Object.entries(referentialConstraints).forEach( ([ fileName, constraint ]) => {
+        Object.entries(referentialConstraints).forEach(([ fileName, constraint ]) => {
           resultObj.hdbconstraint[fileName] = constraint;
         });
       }
       else {
-        Object.values(referentialConstraints).forEach( (constraint) => {
+        Object.values(referentialConstraints).forEach((constraint) => {
           result += `,\n${constraint}`;
         });
       }
@@ -546,8 +546,7 @@ function toSqlDdl(csn, options) {
           = `UNIQUE INVERTED INDEX ${renderArtifactName(`${artifactName}_${cn}`)} ON ${tableName} (${c.map(cpath => quoteSqlId(cpath.ref[0])).join(', ')})`;
       }
       else {
-        result += `,\n${childEnv.indent}CONSTRAINT ${renderArtifactName(`${artifactName}_${cn}`)} UNIQUE (${
-          c.map(cpath => quoteSqlId(cpath.ref[0])).join(', ')})`;
+        result += `,\n${childEnv.indent}CONSTRAINT ${renderArtifactName(`${artifactName}_${cn}`)} UNIQUE (${c.map(cpath => quoteSqlId(cpath.ref[0])).join(', ')})`;
       }
     }
     result += `${env.indent}\n)`;
@@ -568,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;
@@ -659,8 +658,7 @@ function toSqlDdl(csn, options) {
     if (duplicateChecker)
       duplicateChecker.addElement(quotedElementName, elm.$location, elementName);
 
-    let result = `${env.indent + quotedElementName} ${
-      renderTypeReference(artifactName, elementName, elm)
+    let result = `${env.indent + quotedElementName} ${renderTypeReference(artifactName, elementName, elm)
     }${renderNullability(elm, true)}`;
     if (elm.default)
       result += ` DEFAULT ${renderExpr(elm.default, env)}`;
@@ -956,7 +954,7 @@ function toSqlDdl(csn, options) {
     // An empty actual parameter list is rendered as `()`.
     const ref = csn.definitions[path.ref[0].id] || csn.definitions[path.ref[0]];
     if (ref && ref.params) {
-      result += `(${renderArgs(path.ref[0].args || {}, '=>', env, syntax)})`;
+      result += `(${renderArgs(path.ref[0] || {}, '=>', env, syntax)})`;
     }
     else if ([ 'udf' ].includes(syntax)) {
       // if syntax is user defined function, render empty argument list
@@ -978,21 +976,23 @@ function toSqlDdl(csn, options) {
    * Render function arguments or view parameters (positional if array, named if object/dict),
    * using 'sep' as separator for positional parameters
    *
-   * @param {Array|object} args Arguments to render
+   * @param {object} node with `args` to render
    * @param {string} sep Separator between args
    * @param {object} env Render environment
    * @param {string} syntax Some magic A2J paramter - for calcview parameter rendering
    * @returns {string} Rendered arguments
    * @throws Throws if args is not an array or object.
    */
-  function renderArgs(args, sep, env, syntax) {
+  function renderArgs(node, sep, env, syntax) {
+    const args = node.args ? node.args : {};
     // Positional arguments
     if (Array.isArray(args))
       return args.map(arg => renderExpr(arg, env)).join(', ');
 
     // Named arguments (object/dict)
     else if (typeof args === 'object')
-      return Object.keys(args).map(key => `${decorateParameter(key, syntax)} ${sep} ${renderExpr(args[key], env)}`).join(', ');
+      // if this is a function param which is not a reference to the model, we must not quote it
+      return Object.keys(args).map(key => `${node.func ? key : decorateParameter(key, syntax)} ${sep} ${renderExpr(args[key], env)}`).join(', ');
 
 
     throw new Error(`Unknown args: ${JSON.stringify(args)}`);
@@ -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);
@@ -1088,8 +1088,15 @@ function toSqlDdl(csn, options) {
         const p = params[pn];
         if (p.notNull === true || p.notNull === false)
           info(null, [ 'definitions', artifactName, 'params', pn ], 'Not Null constraints on SQL view parameters are not allowed and are ignored');
-
-        let pstr = `IN ${prepareIdentifier(pn)} ${renderTypeReference(artifactName, pn, p)}`;
+        // do not quote parameter identifiers for naming mode "quoted" / "hdbcds"
+        // this would be an incompatible change, as non-uppercased, quoted identifiers
+        // are rejected by the HANA compiler.
+        let pIdentifier;
+        if (options.toSql.names === 'quoted' || options.toSql.names === 'hdbcds')
+          pIdentifier = prepareIdentifier(pn);
+        else
+          pIdentifier = quoteSqlId(pn);
+        let pstr = `IN ${pIdentifier} ${renderTypeReference(artifactName, pn, p)}`;
         if (p.default)
           pstr += ` DEFAULT ${renderExpr(p.default)}`;
 
@@ -1144,12 +1151,11 @@ function toSqlDdl(csn, options) {
     const childEnv = increaseIndent(env);
     result += `SELECT${select.distinct ? ' DISTINCT' : ''}`;
     // FIXME: We probably also need to consider `excluding` here ?
-    result += `\n${
-      (select.columns || [ '*' ])
-        .filter(col => !(select.mixin || Object.create(null))[firstPathStepId(col.ref)]) // No mixin columns
-        .map(col => renderViewColumn(col, childEnv))
-        .filter(s => s !== '')
-        .join(',\n')}\n`;
+    result += `\n${(select.columns || [ '*' ])
+      .filter(col => !(select.mixin || Object.create(null))[firstPathStepId(col.ref)]) // No mixin columns
+      .map(col => renderViewColumn(col, childEnv))
+      .filter(s => s !== '')
+      .join(',\n')}\n`;
     result += `${env.indent}FROM ${renderViewSource(artifactName, select.from, env)}`;
     if (select.where)
       result += `\n${env.indent}WHERE ${renderExpr(select.where, env, true, true)}`;
@@ -1336,7 +1342,8 @@ function toSqlDdl(csn, options) {
   function renderExpr(x, env, inline = true, nestedExpr = false) {
     // Compound expression
     if (Array.isArray(x)) {
-      return processExprArray(x, renderExpr, env, inline, nestedExpr);
+      const tokens = x.map(item => renderExpr(item, env, inline, nestedExpr));
+      return beautifyExprArray(tokens);
     }
     else if (typeof x === 'object' && x !== null) {
       if (nestedExpr && x.cast && x.cast.type)
@@ -1376,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
@@ -1398,29 +1407,36 @@ 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) {
         case 'number':
         case 'boolean':
         case 'null':
-        // 17.42, NULL, TRUE
+          // 17.42, NULL, TRUE
           return String(x.val).toUpperCase();
         case 'x':
-        // x'f000'
+          // x'f000'
           return `${x.literal}'${x.val}'`;
         case 'date':
         case 'time':
         case 'timestamp':
           if (options.toSql.dialect === 'sqlite') {
-          // simple string literal '2017-11-02'
+            // simple string literal '2017-11-02'
             return `'${x.val}'`;
           }
           // date'2017-11-02'
           return `${x.literal}'${x.val}'`;
 
         case 'string':
-        // 'foo', with proper escaping
+          // 'foo', with proper escaping
           return `'${x.val.replace(/'/g, '\'\'')}'`;
         case 'object':
           if (x.val === null)
@@ -1434,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)
@@ -1446,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 (
@@ -1468,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}'`;
 
@@ -1487,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;
     }
     /**
@@ -1585,13 +1610,13 @@ function toSqlDdl(csn, options) {
 
         // Not really a path step but an object-like function call
         if (s.func)
-          return `${s.func}(${renderArgs(s.args, '=>', env, null)})`;
+          return `${s.func}(${renderArgs(s, '=>', env, null)})`;
 
         // Path step, possibly with view parameters and/or filters
         let result = `${quoteSqlId(s.id)}`;
         if (s.args) {
           // View parameters
-          result += `(${renderArgs(s.args, '=>', env, null)})`;
+          result += `(${renderArgs(s, '=>', env, null)})`;
         }
         if (s.where) {
           // Filter, possibly with cardinality

package/lib/render/utils/common.js

@@ -33,7 +33,7 @@ const { implicitAs } = require('../../model/csnRefs');
 function renderFunc( funcName, node, dialect, renderArgs) {
   if (funcWithoutParen( node, dialect ))
     return funcName;
-  return `${funcName}(${renderArgs( node.args )})`;
+  return `${funcName}(${renderArgs( node )})`;
 }
 
 /**
@@ -53,19 +53,14 @@ function funcWithoutParen( node, dialect ) {
 }
 
 /**
- * Process an expression array, rendering each subexpression and joining them appropriately
+ * Process already rendered expression parts by joining them nicely
  *
- * @param {Array} xpr Expression array
- * @param {Function} renderExpr Function to render expressions
- * @param {CdlRenderEnvironment} env Environment for rendering
- * @param {boolean} inline Wether to render the expression inline
- * @param {boolean} inExpr Wether to render as if a subexpression
+ * @param {Array} tokens Array of expression tokens
  *
  * @returns {string} The rendered xpr
  */
-function processExprArray(xpr, renderExpr, env, inline, inExpr) {
+function beautifyExprArray(tokens) {
   // Simply concatenate array parts with spaces (with a tiny bit of beautification)
-  const tokens = xpr.map(item => renderExpr(item, env, inline, inExpr));
   let result = '';
   for (let i = 0; i < tokens.length; i++) {
     result += tokens[i];
@@ -378,7 +373,7 @@ function getHanaComment(obj) {
 
 module.exports = {
   renderFunc,
-  processExprArray,
+  beautifyExprArray,
   getNamespace,
   getRealName,
   addIntermediateContexts,
@@ -387,4 +382,5 @@ module.exports = {
   hasHanaComment,
   getHanaComment,
   findElement,
+  funcWithoutParen,
 };

package/lib/sql-identifier.js

@@ -51,7 +51,12 @@ const sqlDialects = {
     effectiveName: name => name.toUpperCase(),
     asDelimitedId: name => `"${ name.replace(/"/g, '""')}"`,
   },
-  // TODO: hdbcds for HANA CDS
+  hdbcds: {
+    regularRegex: /^[A-Za-z_][A-Za-z_0-9]*$/,
+    reservedWords: keywords.hdbcds,
+    effectiveName: name => name,
+    asDelimitedId: name => `"${ name.replace(/"/g, '""')}"`,
+  },
 };
 
 function smartId( name, dialect ) {