@sap/cds-compiler 3.4.4 → 3.5.2

package/lib/render/toSql.js

@@ -77,12 +77,12 @@ const { ModelError } = require('../base/error');
  * @param {CSN.Options} options Transformation options
  * @returns {object} Dictionary of artifact-type:artifacts, where artifacts is a dictionary of name:content
  */
-function toSqlDdl(csn, options) {
+function toSqlDdl( csn, options ) {
   timetrace.start('SQL rendering');
   const {
     error, warning, info, throwWithAnyError,
   } = makeMessageFunction(csn, options, 'to.sql');
-  const { quoteSqlId, prepareIdentifier } = getIdentifierUtils(options);
+  const { quoteSqlId, prepareIdentifier, renderArtifactName } = getIdentifierUtils(csn, options);
 
   const exprRenderer = createExpressionRenderer({
     // FIXME: For the sake of simplicity, we should get away from all this uppercasing in toSql
@@ -119,7 +119,7 @@ function toSqlDdl(csn, options) {
     },
   });
 
-  function renderExpr(x, env) {
+  function renderExpr( x, env ) {
     return exprRenderer.renderExpr(x, env);
   }
 
@@ -252,8 +252,7 @@ function toSqlDdl(csn, options) {
   for (const name in deletions)
     deletions[name] = `${options.testMode ? '' : sqlVersionLine}${deletions[name]}`;
 
-
-  timetrace.stop();
+  timetrace.stop('SQL rendering');
   return mainResultObj;
 
   /**
@@ -264,7 +263,7 @@ function toSqlDdl(csn, options) {
    * @param {object} resultObj Result collector
    * @param {object} env Render environment
    */
-  function renderArtifactInto(artifactName, art, resultObj, env) {
+  function renderArtifactInto( artifactName, art, resultObj, env ) {
     // Ignore whole artifacts if forRelationalDB says so
     if (art.abstract || hasValidSkipOrExists(art))
       return;
@@ -306,7 +305,7 @@ function toSqlDdl(csn, options) {
    * @param {object} resultObj Result collector
    * @param {object} env Render environment
    */
-  function renderArtifactExtensionInto(artifactName, artifact, ext, resultObj, env) {
+  function renderArtifactExtensionInto( artifactName, artifact, ext, resultObj, env ) {
     // Property kind is always omitted for elements and can be omitted for
     // top-level type definitions, it does not exist for extensions.
     if (artifactName && !ext.query)
@@ -317,52 +316,36 @@ function toSqlDdl(csn, options) {
   }
 
   // Render an artifact deletion into the appropriate dictionary of 'resultObj'.
-  function renderArtifactDeletionInto(artifactName, art, resultObj) {
+  function renderArtifactDeletionInto( artifactName, art, resultObj ) {
     const tableName = renderArtifactName(artifactName);
     deletionsDuplicateChecker.addArtifact(tableName, art.$location, artifactName);
 
     addDeletion(resultObj, artifactName, `DROP TABLE ${tableName}`);
   }
 
-  /**
-   * Given the following artifact name: namespace.prefix.entity.with.dot, render the following,
-   * depending on the naming mode:
-   * - plain: NAMESPACE_PREFIX_ENTITY_WITH_DOT
-   * - quoted: namespace.prefix.entity_with_dot
-   * - hdbcds: namespace::prefix.entity_with_dot
-   *
-   *
-   * @param {string} artifactName Artifact name to render
-   *
-   * @returns {string} Artifact name
-   */
-  function renderArtifactName(artifactName) {
-    return quoteSqlId(getResultingName(csn, options.sqlMapping, artifactName));
-  }
-
   // Render an artifact migration into the appropriate dictionary of 'resultObj'.
   // Only HANA SQL is currently supported.
-  function renderArtifactMigrationInto(artifactName, migration, resultObj, env) {
-    function reducesTypeSize(def) {
+  function renderArtifactMigrationInto( artifactName, migration, resultObj, env ) {
+    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]);
     }
-    function getEltStr(defVariant, eltName, changeType = 'extension') {
+    function getEltStr( defVariant, eltName, changeType = 'extension' ) {
       return defVariant.target
         ? renderAssociationElement(eltName, defVariant, env)
         : renderElement(artifactName, eltName, defVariant, null, null, activateAlterMode(env, changeType));
     }
-    function getEltStrNoProps(defVariant, eltName, ...props) {
+    function getEltStrNoProps( defVariant, eltName, ...props ) {
       const defNoProps = Object.assign({}, defVariant);
       for (const prop of props)
         delete defNoProps[prop];
       return getEltStr(defNoProps, eltName);
     }
-    function oldAnnoChangedIncompatibly(defOld, defNew) {
+    function oldAnnoChangedIncompatibly( defOld, defNew ) {
       return typeof defOld === 'string' && defOld.trim().length && !(typeof defNew === 'string' && defNew.trim().startsWith(`${defOld.trim()} `));
     }
-    function getUnknownSqlReason(anno, artName, defOld, defNew, eltName) {
+    function getUnknownSqlReason( anno, artName, defOld, defNew, eltName ) {
       const changeKind = defNew === undefined
         ? `removed (previous value: ${JSON.stringify(defOld)})`
         : `changed from ${JSON.stringify(defOld)} to ${JSON.stringify(defNew)}`;
@@ -482,7 +465,7 @@ function toSqlDdl(csn, options) {
    * @param {object} resultObj Result collector
    * @param {object} env Render environment
    */
-  function renderEntityInto(artifactName, art, resultObj, env) {
+  function renderEntityInto( artifactName, art, resultObj, env ) {
     env._artifact = art;
     const childEnv = increaseIndent(env);
     const hanaTc = art.technicalConfig && art.technicalConfig.hana;
@@ -591,7 +574,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @param {DuplicateChecker} duplicateChecker
    */
-  function renderExtendInto(artifactName, artifactElements, extElements, resultObj, env, duplicateChecker) {
+  function renderExtendInto( artifactName, artifactElements, extElements, resultObj, env, duplicateChecker ) {
     const tableName = renderArtifactName(artifactName);
     if (duplicateChecker)
       duplicateChecker.addArtifact(tableName, undefined, artifactName);
@@ -607,7 +590,7 @@ function toSqlDdl(csn, options) {
     }
   }
 
-  function addMigration(resultObj, artifactName, drop, sqlArray, description) {
+  function addMigration( resultObj, artifactName, drop, sqlArray, description ) {
     if (!(artifactName in resultObj.migrations))
       resultObj.migrations[artifactName] = [];
 
@@ -620,7 +603,7 @@ function toSqlDdl(csn, options) {
     resultObj.migrations[artifactName].push(...migrations);
   }
 
-  function addDeletion(resultObj, artifactName, deletionSql) {
+  function addDeletion( resultObj, artifactName, deletionSql ) {
     resultObj.deletions[artifactName] = deletionSql;
   }
 
@@ -631,7 +614,7 @@ function toSqlDdl(csn, options) {
    * @param {object} hanaTc Technical configuration object
    * @returns {object} fzindex for the element
    */
-  function getFzIndex(elemName, hanaTc) {
+  function getFzIndex( elemName, hanaTc ) {
     if (!hanaTc || !hanaTc.fzindexes || !hanaTc.fzindexes[elemName])
       return undefined;
 
@@ -661,7 +644,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered element
    */
-  function renderElement(artifactName, elementName, elm, duplicateChecker, fzindex, env) {
+  function renderElement( artifactName, elementName, elm, duplicateChecker, fzindex, env ) {
     if (elm.virtual || elm.target)
       return '';
 
@@ -705,7 +688,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered association element
    */
-  function renderAssociationElement(elementName, elm, env) {
+  function renderAssociationElement( elementName, elm, env ) {
     let result = '';
     if (elm.target) {
       result += env.indent;
@@ -741,7 +724,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered technical configuration
    */
-  function renderTechnicalConfiguration(tc, env) {
+  function renderTechnicalConfiguration( tc, env ) {
     let result = '';
 
     if (!tc)
@@ -785,7 +768,7 @@ function toSqlDdl(csn, options) {
    * @param {object} resultObj Result collector
    * @param {object} env Render environment
    */
-  function renderIndexesInto(indexes, artifactName, resultObj, env) {
+  function renderIndexesInto( indexes, artifactName, resultObj, env ) {
     // Indices and full-text indices
     for (const idxName in indexes || {}) {
       let result = '';
@@ -817,7 +800,7 @@ function toSqlDdl(csn, options) {
      * @param {Array} index Index definition
      * @returns {Array} Index with artifact name inserted
      */
-    function insertTableName(index) {
+    function insertTableName( index ) {
       const i = index.indexOf('index');
       const j = index.indexOf('(');
       if (i > index.length - 2 || !index[i + 1].ref || j < i || j > index.length - 2)
@@ -848,7 +831,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered view source
    */
-  function renderViewSource(artifactName, source, env) {
+  function renderViewSource( artifactName, source, env ) {
     // Sub-SELECT
     if (source.SELECT || source.SET) {
       let result = `(${renderQuery(artifactName, source, increaseIndent(env))})`;
@@ -888,7 +871,7 @@ function toSqlDdl(csn, options) {
    * @param {object} card CSN cardinality representation
    * @returns {string} Rendered cardinality
    */
-  function renderJoinCardinality(card) {
+  function renderJoinCardinality( card ) {
     let result = '';
     if (card) {
       if (card.srcmin && card.srcmin === 1)
@@ -916,7 +899,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered path
    */
-  function renderAbsolutePathWithAlias(artifactName, path, env) {
+  function renderAbsolutePathWithAlias( artifactName, path, env ) {
     // This actually can't happen anymore because assoc2joins should have taken care of it
     if (path.ref[0].where)
       throw new ModelError(`"${artifactName}": Filters in FROM are not supported for conversion to SQL`);
@@ -954,7 +937,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered path
    */
-  function renderAbsolutePath(path, sep, env) {
+  function renderAbsolutePath( path, sep, env ) {
     // Sanity checks
     if (!path.ref)
       throw new ModelError(`Expecting ref in path: ${JSON.stringify(path)}`);
@@ -1001,7 +984,7 @@ function toSqlDdl(csn, options) {
    * @returns {string} Rendered arguments
    * @throws Throws if args is not an array or object.
    */
-  function renderArgs(node, sep, env, syntax) {
+  function renderArgs( node, sep, env, syntax ) {
     const args = node.args ? node.args : {};
     // Positional arguments
     if (Array.isArray(args))
@@ -1023,7 +1006,7 @@ function toSqlDdl(csn, options) {
      * @param {string|null} parameterSyntax Some magic A2J parameter - for calcview parameter rendering
      * @returns {string} Rendered argument
      */
-    function decorateParameter(arg, parameterSyntax) {
+    function decorateParameter( arg, parameterSyntax ) {
       if (parameterSyntax === 'calcview')
         return `PLACEHOLDER."$$${arg}$$"`;
 
@@ -1040,7 +1023,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered column
    */
-  function renderViewColumn(col, elements, env) {
+  function renderViewColumn( col, elements, env ) {
     let result = '';
     const leaf = col.as || col.ref && col.ref[col.ref.length - 1] || col.func;
     if (leaf && elements[leaf] && elements[leaf].virtual) {
@@ -1066,7 +1049,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered view
    */
-  function renderView(artifactName, art, env) {
+  function renderView( artifactName, art, env ) {
     env._artifact = art;
     const viewName = renderArtifactName(artifactName);
     definitionsDuplicateChecker.addArtifact(art['@cds.persistence.name'], art && art.$location, artifactName);
@@ -1103,7 +1086,7 @@ function toSqlDdl(csn, options) {
    * @param {Object} params Dictionary of parameters
    * @returns {string} Rendered parameters
    */
-  function renderParameterDefinitions(artifactName, params) {
+  function renderParameterDefinitions( artifactName, params ) {
     let result = '';
     if (params) {
       const parray = [];
@@ -1139,7 +1122,7 @@ function toSqlDdl(csn, options) {
    * @param {CSN.Elements} [elements] to override direct query elements - e.g. leading union should win
    * @returns {string} Rendered query
    */
-  function renderQuery(artifactName, query, env, elements = null) {
+  function renderQuery( artifactName, query, env, elements = null ) {
     let result = '';
     // Set operator, like UNION, INTERSECT, ...
     if (query.SET) {
@@ -1205,7 +1188,7 @@ function toSqlDdl(csn, options) {
    * @param {Array} ref Array of refs
    * @returns {string|undefined} Id of first path step
    */
-  function firstPathStepId(ref) {
+  function firstPathStepId( ref ) {
     return ref && ref[0] && (ref[0].id || ref[0]);
   }
 
@@ -1216,7 +1199,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Renderenvironment
    * @returns {string} Rendered LIMIT clause
    */
-  function renderLimit(limit, env) {
+  function renderLimit( limit, env ) {
     let result = '';
     if (limit.rows !== undefined)
       result += `LIMIT ${renderExpr(limit.rows, env)}`;
@@ -1235,7 +1218,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {string} Rendered ORDER BY entry
    */
-  function renderOrderByEntry(entry, env) {
+  function renderOrderByEntry( entry, env ) {
     let result = renderExpr(entry, env);
     if (entry.sort)
       result += ` ${entry.sort.toUpperCase()}`;
@@ -1254,7 +1237,7 @@ function toSqlDdl(csn, options) {
    * @param {CSN.Element} elm CSN element
    * @returns {string} Rendered type reference
    */
-  function renderTypeReference(artifactName, elementName, elm) {
+  function renderTypeReference( artifactName, elementName, elm ) {
     let result = '';
 
     // Anonymous structured type: Not supported with SQL (but shouldn't happen anyway after forHana flattened them)
@@ -1296,7 +1279,7 @@ function toSqlDdl(csn, options) {
    * @param {string} typeName Name of the type
    * @returns {string} Rendered type
    */
-  function renderBuiltinType(typeName) {
+  function renderBuiltinType( typeName ) {
     const forHanaRenamesToEarly = {
       'cds.UTCDateTime': 'cds.DateTime',
       'cds.UTCTimestamp': 'cds.Timestamp',
@@ -1316,7 +1299,7 @@ function toSqlDdl(csn, options) {
    * @param {boolean} deltaMode Look for a $notNull and use that with precedence over notNull
    * @returns {string} NULL/NOT NULL or ''
    */
-  function renderNullability(obj, treatKeyAsNotNull = false, deltaMode = false) {
+  function renderNullability( obj, treatKeyAsNotNull = false, deltaMode = false ) {
     if (deltaMode && obj.$notNull !== undefined) { // can be set via compare.js if it goes from "not null" to implicit "null"
       return obj.$notNull ? ' NOT NULL' : ' NULL';
     }
@@ -1336,7 +1319,7 @@ function toSqlDdl(csn, options) {
    * @param {CSN.Element} elm CSN element
    * @returns {string} Rendered type parameters
    */
-  function renderTypeParameters(elm) {
+  function renderTypeParameters( elm ) {
     const params = [];
     // Length, precision and scale (even if incomplete)
     if (elm.length !== undefined)
@@ -1358,7 +1341,7 @@ function toSqlDdl(csn, options) {
     return params.length === 0 ? '' : `(${params.join(', ')})`;
   }
 
-  function renderExpressionLiteral(x) {
+  function renderExpressionLiteral( x ) {
     // Literal value, possibly with explicit 'literal' property
     switch (x.literal || typeof x.val) {
       case 'number':
@@ -1392,7 +1375,7 @@ function toSqlDdl(csn, options) {
     }
   }
 
-  function renderExpressionRef(x, env) {
+  function renderExpressionRef( x, env ) {
     if (!x.param && !x.global) {
       const magicReplacement = getVariableReplacement(x.ref, options);
 
@@ -1524,7 +1507,7 @@ function toSqlDdl(csn, options) {
      * @param {number} idx index of the path step in the overall path
      * @returns {string} Rendered path step
      */
-    function renderPathStep(s, idx) {
+    function renderPathStep( s, idx ) {
       // Simple id or absolute name
       if (typeof (s) === 'string') {
         // TODO: When is this actually executed and not handled already in renderExpr?
@@ -1573,7 +1556,7 @@ function toSqlDdl(csn, options) {
     }
   }
 
-  function renderWindowFunction(funcName, node, fctEnv) {
+  function renderWindowFunction( funcName, node, fctEnv ) {
     let r = `${funcName}(${renderArgs(node, '=>', fctEnv, null)}) `;
     r += renderExpr(node.xpr, fctEnv); // xpr[0] is 'over'
     return r;
@@ -1585,7 +1568,7 @@ function toSqlDdl(csn, options) {
    * @param {object} env Render environment
    * @returns {object} Render environment with increased indent
    */
-  function increaseIndent(env) {
+  function increaseIndent( env ) {
     return Object.assign({}, env, { indent: `${env.indent}  ` });
   }
   /**
@@ -1595,7 +1578,7 @@ function toSqlDdl(csn, options) {
    * @param {string} changeType 'extension' or 'migration'
    * @returns {object} Render environment with alterMode
    */
-  function activateAlterMode(env, changeType) {
+  function activateAlterMode( env, changeType ) {
     return Object.assign({ alterMode: true, changeType }, env);
   }
 }
@@ -1607,8 +1590,8 @@ function toSqlDdl(csn, options) {
  * @param {string} sqlDialect
  * @return {string}
  */
-function renderStringForSql(str, sqlDialect) {
-  if (sqlDialect === 'hana' || sqlDialect === 'sqlite') {
+function renderStringForSql( str, sqlDialect ) {
+  if (sqlDialect === 'hana' || sqlDialect === 'sqlite' || sqlDialect === 'h2') {
     // SQLite
     // ======
     // SQLite's tokenizer available at
@@ -1618,6 +1601,13 @@ function renderStringForSql(str, sqlDialect) {
     // <https://sqlite.org/nulinstr.html>.
     //
     //
+    // H2
+    // ======
+    // H2's tokenizer available at
+    // <https://github.com/h2database/h2database/blob/master/h2/src/main/org/h2/command/Tokenizer.java>.
+    // For strings, see method "readCharacterString()".
+    //
+    //
     // HANA
     // ====
     // Respects the specification available at

package/lib/render/utils/common.js

@@ -31,7 +31,7 @@ const { implicitAs } = require('../../model/csnRefs');
  * @param {(a: string) => string} renderArgs Function to render function arguments
  * @returns {string} Function string
  */
-function renderFunc( funcName, node, dialect, renderArgs) {
+function renderFunc( funcName, node, dialect, renderArgs ) {
   if (funcWithoutParen( node, dialect ))
     return funcName;
   return `${funcName}(${renderArgs( node )})`;
@@ -60,7 +60,7 @@ function funcWithoutParen( node, dialect ) {
  *
  * @returns {string} The rendered xpr
  */
-function beautifyExprArray(tokens) {
+function beautifyExprArray( tokens ) {
   // Simply concatenate array parts with spaces (with a tiny bit of beautification)
   let result = '';
   for (let i = 0; i < tokens.length; i++) {
@@ -79,7 +79,7 @@ function beautifyExprArray(tokens) {
  * @param {string} artifactName Artifact name to use
  * @returns {string} non-prefix part of the artifact name
  */
-function getRealName(csn, artifactName) {
+function getRealName( csn, artifactName ) {
   const parts = artifactName.split('.');
   // Length of 1 -> There can be no prefix
   if (parts.length === 1)
@@ -118,7 +118,7 @@ function getRealName(csn, artifactName) {
    * @param {string} artifactName Name of the artifact to check for
    * @returns {string | null} Name of the topmost context or null
    */
-function getParentContextName(csn, artifactName) {
+function getParentContextName( csn, artifactName ) {
   const parts = artifactName.split('.');
   for (let i = 0; i < parts.length - 1; i++) {
     const name = parts.slice(0, i).join('.');
@@ -137,7 +137,7 @@ function getParentContextName(csn, artifactName) {
  *
  * @param {Function[]} killList Array to add cleanup functions to
  */
-function addContextMarkers(csn, killList) {
+function addContextMarkers( csn, killList ) {
   const contextsToCreate = Object.create(null);
   forEachDefinition(csn, (art, artifactName) => {
     const namespace = getNamespace(csn, artifactName);
@@ -172,7 +172,7 @@ function addContextMarkers(csn, killList) {
   * @param {string} artifactName Name of the current context
   * @returns {string[]} All possible context names inbetween
   */
-function getIntermediateContextNames(csn, parentName, artifactName) {
+function getIntermediateContextNames( csn, parentName, artifactName ) {
   const parentLength = parentName.split('.').length;
   const parts = artifactName.split('.');
   const names = [];
@@ -194,7 +194,7 @@ function getIntermediateContextNames(csn, parentName, artifactName) {
  * @param {string} artifactName
  * @param {Function[]} killList Array to add cleanup functions to
  */
-function addMissingChildContexts(csn, artifactName, killList) {
+function addMissingChildContexts( csn, artifactName, killList ) {
   // Get all other definitions sharing the same prefix, sorted by shortest first
   const possibleNames = Object.keys(csn.definitions).filter(name => name.startsWith(`${artifactName}.`)).sort((a, b) => a.length - b.length);
   for (const name of possibleNames) {
@@ -203,7 +203,7 @@ function addMissingChildContexts(csn, artifactName, killList) {
       addPossibleGaps(name.slice(artifactName.length + 1).split('.'), artifactName);
   }
 
-  function addPossibleGaps(possibleGaps, gapArtifactName) {
+  function addPossibleGaps( possibleGaps, gapArtifactName ) {
     for (const gap of possibleGaps) {
       gapArtifactName += `.${gap}`;
       if (!csn.definitions[gapArtifactName]) {
@@ -314,7 +314,7 @@ const cdsToHdbcdsTypes = {
  * @param {CSN.Column} column Column from the same query
  * @returns {CSN.Element}
  */
-function findElement(elements, column) {
+function findElement( elements, column ) {
   if (!elements)
     return undefined;
   if (column.as)
@@ -333,7 +333,7 @@ function findElement(elements, column) {
   *
   * @param {Function[]} killList Array to add cleanup functions to
   */
-function addIntermediateContexts(csn, killList) {
+function addIntermediateContexts( csn, killList ) {
   for (const artifactName in csn.definitions) {
     const artifact = csn.definitions[artifactName];
     if ((artifact.kind === 'context') && !artifact._ignore) {
@@ -365,7 +365,7 @@ function addIntermediateContexts(csn, killList) {
  * @param {CSN.Options} options To check for `disableHanaComments`
  * @returns {boolean}
  */
-function hasHanaComment(obj, options) {
+function hasHanaComment( obj, options ) {
   return !options.disableHanaComments && typeof obj.doc === 'string';
 }
 /**
@@ -377,7 +377,7 @@ function hasHanaComment(obj, options) {
  * @param {CSN.Artifact|CSN.Element} obj
  * @returns {string}
  */
-function getHanaComment(obj) {
+function getHanaComment( obj ) {
   return obj.doc.split('\n\n')[0].trim();
 }
 
@@ -389,7 +389,7 @@ function getHanaComment(obj) {
  * @param {object} obj
  * @returns {object} object with .front and .back
  */
-function getSqlSnippets(options, obj) {
+function getSqlSnippets( options, obj ) {
   const front = obj['@sql.prepend'] ? `${obj['@sql.prepend']} ` : '';
   const back = obj['@sql.append'] ? ` ${obj['@sql.append']}` : '';
 
@@ -425,7 +425,7 @@ function getSqlSnippets(options, obj) {
  * @property {Function} [renderExpr]
  * @property {Function} [renderSubExpr]
  * @property {boolean} [isNestedXpr]
- * @property {CdlRenderEnvironment} [env]
+ * @property {object} [env]
  */
 
 /**
@@ -445,7 +445,7 @@ function getSqlSnippets(options, obj) {
  * @property {Function} renderExpr
  * @property {Function} renderSubExpr
  * @property {boolean} isNestedXpr
- * @property {CdlRenderEnvironment} env
+ * @property {object} env
  */
 
 /**
@@ -454,7 +454,7 @@ function getSqlSnippets(options, obj) {
  *
  * @param xpr
  */
-function withoutCast(xpr) {
+function withoutCast( xpr ) {
   return !xpr.cast ? xpr : { ...xpr, cast: undefined };
 }
 
@@ -465,12 +465,12 @@ function withoutCast(xpr) {
  * @param {ExpressionConfiguration} rendererBase
  * @returns {ExpressionRenderer} Expression rendering utility
  */
-function createExpressionRenderer(rendererBase) {
+function createExpressionRenderer( rendererBase ) {
   const renderer = Object.create(rendererBase);
   renderer.visitExpr = visitExpr;
   /**
    * @param {any} x
-   * @param {CdlRenderEnvironment} env
+   * @param {object} env
    */
   renderer.renderExpr = function renderExpr(x, env) {
     /** @type {ExpressionRenderer} */
@@ -484,7 +484,7 @@ function createExpressionRenderer(rendererBase) {
   };
   /**
    * @param {any} x
-   * @param {CdlRenderEnvironment} env
+   * @param {object} env
    */
   renderer.renderSubExpr = function renderSubExpr(x, env) {
     /** @type {ExpressionRenderer} */
@@ -510,7 +510,7 @@ function createExpressionRenderer(rendererBase) {
  * @this ExpressionRenderer
  * @returns {string} Rendered expression
  */
-function visitExpr(x) {
+function visitExpr( x ) {
   if (Array.isArray(x)) {
     // Compound expression, e.g. for on- or where-conditions.
     // If xpr is part of an array, it's always a nested xpr,
@@ -562,23 +562,6 @@ function visitExpr(x) {
   throw new ModelError(`renderExpr(): Unknown expression: ${JSON.stringify(x)}`);
 }
 
-
-/**
- * @typedef CdlRenderEnvironment Rendering environment used throughout the render process.
- *
- * @property {string}   indent Current indentation as a string, e.g. '  ' for two spaces.
- * @property {CSN.Path} [path] CSN path to the current artifact
- * @property {string}   [currentArtifactName] Name of the current artifact
- * @property {{[name: string]: {
-      quotedName: string,
-      quotedAlias: string
-    }}} topLevelAliases Dictionary of aliases for used artifact names
- *
- * @property {string} namePrefix Current name prefix (including trailing dot if not empty)
- * @property {boolean} [skipKeys] Skip rendering keys in subqueries
- * @property {CSN.Artifact} [_artifact] The original view artifact, used when rendering queries
- */
-
 module.exports = {
   renderFunc,
   createExpressionRenderer,

package/lib/render/utils/delta.js

@@ -36,7 +36,7 @@ class DeltaRenderer {
   /**
    * By default, we don't support rendering association-alters - only for HANA
    */
-  addAssociations() {
+  addAssociations(_artifactName, _extElements, _env) {
     return [];
   }
 
@@ -57,7 +57,7 @@ class DeltaRenderer {
   /**
    * No associations by default - only for HANA.
    */
-  dropAssociation() {
+  dropAssociation(_artifactName, _sqlId) {
     return [];
   }
 
@@ -208,7 +208,7 @@ class DeltaRendererH2 extends DeltaRenderer {
  * @param {object} scopedFunctions
  * @returns {DeltaRenderer}
  */
-function getDeltaRenderer(options, scopedFunctions) {
+function getDeltaRenderer( options, scopedFunctions ) {
   switch (options.sqlDialect) {
     case 'hana':
       return new DeltaRendererHana(options, scopedFunctions);