@sap/cds-compiler 2.12.0 → 2.15.2

package/doc/CHANGELOG_DEPRECATED.md

@@ -11,9 +11,25 @@ Note: `deprecated` features are listed in this ChangeLog just for information.
 **When the `deprecated` option is set, the `beta` option is ignored,
 and several new features are not available.**
 
+## Version 2.XX.YY - 2022-MM-DD
+
+### Added `redirectInSubQueries`
+
+When this option is set, we auto-redirect associations and composition also in
+non-main queries, sometimes without rewriting the `keys`/`on` (there will be no
+fix for this).
+
+### Added `oldVirtualNotNullPropagation`
+
+When this option is set, we do not propagate `notNull` along types.
+Additionally, we propagate `notNull` and `virtual` from a query source element
+to the sub elements of a query entity element, even if the property is not
+propagated to the query entity element itself (like with type references).
+
+
 ## Version 2.2.0
 
-## Added `noScopedRedirections`
+### Added `noScopedRedirections`
 
 When this option is set, the definition scope is not taken into account when
 trying to find an implicit redirection target.  Setting the following
@@ -21,18 +37,18 @@ deprecated options also switches off scoped redirections (additionally to their
 other effect): `noElementsExpansion`, `generatedEntityNameWithUnderscore`,
 `shortAutoexposed`, `longAutoexposed`, `noInheritedAutoexposeViaComposition`.
 
-## Added `noInheritedAutoexposeViaComposition`
+### Added `noInheritedAutoexposeViaComposition`
 
 When this option is set, only entities directly specified after `Composition of` are
 auto-exposed, not entities used as target via explicit or implicit `redirected to`.
 
 ## Version 2.0.16
 
-## Added `downgradableErrors`
+### Added `downgradableErrors`
 
 Allow to change the severity of some errors which should stay to be an error.
 
-## Added `shortAutoexposed`
+### Added `shortAutoexposed`
 
 When this option is set (and `generatedEntityNameWithUnderscore`), the names of
 autoexposed entities are calculated according to the default compiler v1
@@ -40,13 +56,13 @@ behavior (without v1 options `dependentAutoexposed` and `longAutoexposed`).
 
 ## Version 2.0.10
 
-## Added `longAutoexposed`
+### Added `longAutoexposed`
 
 When this option is set (and `generatedEntityNameWithUnderscore`),
 the names of autoexposed entities are calculated according to the
 compiler v1 option `longAutoexposed`.
 
-## Added `generatedEntityNameWithUnderscore`
+### Added `generatedEntityNameWithUnderscore`
 
 Keep using `_` is separator for generated autoexposed entities and for entities
 created for managed compositions.  It also disables a definition `A.B.C` if `A`

package/doc/NameResolution.md

@@ -22,22 +22,27 @@ others might want to [skip the introduction](#design-principles).
 
 ## Table of Contents
 
- 1. [Introduction](#introduction)
-    <br/>  –  [Background: SQL](#background-sql)
-    <br/>  –  [Background: modern programming languages](#background-modern-programming-languages)
- 2. [Design Principles](#design-principles)
- 3. [Name Resolution - the Basics](#name-resolution---the-basics)
-    <br/>  –  [Common rules](#common-rules)
-    <br/>  –  [Resolving paths](#resolving-paths)
-    <br/>  –  [Navigation environment](#navigation-environment)
- 4. [References to main artifacts](#references-to-main-artifacts)
- 5. [Values and references to elements](#values-and-references-to-elements)
-    <br/>  –  [References in queries](#references-in-queries)
-    <br/>  –  [References to sibling elements](#references-to-sibling-elements)
-    <br/>  –  [Other element references](#other-element-references)
- 6. [Paths as Annotation Values](#paths-as-annotation-values)
- 7. [Differences to HANA-CDS](#differences-to-hana-cds)
- 8. [Summary](#summary)
+<!-- toc: start -->
+
+1. [Table of Contents](#table-of-contents)
+2. [Introduction](#introduction)
+   1. [Background: SQL](#background-sql)
+   2. [Background: modern programming languages](#background-modern-programming-languages)
+3. [Design Principles](#design-principles)
+4. [Name Resolution - the Basics](#name-resolution---the-basics)
+   1. [Common rules](#common-rules)
+   2. [Resolving paths](#resolving-paths)
+   3. [Navigation environment](#navigation-environment)
+5. [References to main artifacts](#references-to-main-artifacts)
+6. [Values and references to elements](#values-and-references-to-elements)
+   1. [References in queries](#references-in-queries)
+   2. [References to sibling elements](#references-to-sibling-elements)
+   3. [Other element references](#other-element-references)
+7. [Paths as annotation values](#paths-as-annotation-values)
+8. [Differences to HANA-CDS](#differences-to-hana-cds)
+9. [Summary](#summary)
+
+<!-- toc: end -->
 
 
 ## Introduction

package/lib/api/main.js

@@ -33,8 +33,10 @@ const propertyToCheck = {
   odata: 'toOdata',
 };
 
-const { cloneCsn } = require('../model/csnUtils');
+const { cloneCsnNonDict } = require('../model/csnUtils');
 const { toHdbcdsSource } = require('../render/toHdbcds');
+const { ModelError } = require('../base/error');
+const { forEach } = require('../utils/objectUtils');
 
 const relevantGeneralOptions = [ /* for future generic options */ ];
 const relevantOdataOptions = [ 'sqlMapping', 'odataFormat' ];
@@ -90,7 +92,7 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
     // Not able to check
     return;
   }
-  const { error, warning, throwWithError } = makeMessageFunction(csn, options, module);
+  const { error, warning, throwWithAnyError } = makeMessageFunction(csn, options, module);
 
   for (const name of relevantOptionNames ) {
     if (options[name] !== csn.meta.options[name])
@@ -102,7 +104,7 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
       warning('options-mismatch-pretransformed-csn', null, `Expected pre-processed CSN to have option "${ name }" set to "${ options[name] }". Found: "${ csn.meta.options[name] }"`);
   }
 
-  throwWithError();
+  throwWithAnyError();
 }
 
 /**
@@ -115,7 +117,7 @@ function checkPreTransformedCsn(csn, options, relevantOptionNames, warnAboutMism
  * @returns {boolean} Return true if it is pre-transformed
  */
 function isPreTransformed(csn, transformation) {
-  return csn.meta && csn.meta.transformation === transformation;
+  return csn && csn.meta && csn.meta.transformation === transformation;
 }
 
 /**
@@ -152,7 +154,7 @@ function odata(csn, options = {}) {
  */
 function cdl(csn, externalOptions = {}) {
   const internalOptions = prepareOptions.to.cdl(externalOptions);
-  const { result } = backends.toCdlWithCsn(cloneCsn(csn, internalOptions), internalOptions);
+  const { result } = backends.toCdlWithCsn(cloneCsnNonDict(csn, internalOptions), internalOptions);
   return result;
 }
 /**
@@ -173,7 +175,7 @@ function forSql(csn, options = {}) {
  * Transform a CSN like to.hdi
  *
  * @param {CSN.Model} csn Plain input CSN
- * @param {hdiOptions} [options={}] Options
+ * @param {HdiOptions} [options={}] Options
  * @returns {CSN.Model} CSN transformed like to.hdi
  * @private
  */
@@ -186,7 +188,7 @@ function forHdi(csn, options = {}) {
  * Transform a CSN like to.hdbcds
  *
  * @param {CSN.Model} csn Plain input CSN
- * @param {hdbcdsOptions} [options={}] Options
+ * @param {HdbcdsOptions} [options={}] Options
  * @returns {CSN.Model} CSN transformed like to.hdbcds
  * @private
  */
@@ -224,7 +226,7 @@ function sql(csn, options = {}) {
  * Process the given CSN into HDI artifacts.
  *
  * @param {CSN.Model} csn A clean input CSN
- * @param {hdiOptions} [options={}] Options
+ * @param {HdiOptions} [options={}] Options
  * @returns {HDIArtifacts} { <filename>:<content>, ...}
  */
 function hdi(csn, options = {}) {
@@ -247,19 +249,19 @@ function hdi(csn, options = {}) {
     const flat = flattenResultStructure(intermediateResult);
 
     const nameMapping = Object.create(null);
-    const sqlsWithCSNNamesToSort = Object.create(null);
-    const sqlsNotToSort = Object.create(null);
+    const sqlArtifactsWithCSNNamesToSort = Object.create(null);
+    const sqlArtifactsNotToSort = Object.create(null);
 
-    Object.keys(flat).forEach((key) => {
+    forEach(flat, (key) => {
       const artifactNameLikeInCsn = key.replace(/\.[^/.]+$/, '');
       nameMapping[artifactNameLikeInCsn] = key;
       if (key.endsWith('.hdbtable') || key.endsWith('.hdbview'))
-        sqlsWithCSNNamesToSort[artifactNameLikeInCsn] = flat[key];
+        sqlArtifactsWithCSNNamesToSort[artifactNameLikeInCsn] = flat[key];
       else
-        sqlsNotToSort[key] = flat[key];
+        sqlArtifactsNotToSort[key] = flat[key];
     });
 
-    const sorted = sortViews({ sql: sqlsWithCSNNamesToSort, csn: sqlCSN })
+    const sorted = sortViews({ sql: sqlArtifactsWithCSNNamesToSort, csn: sqlCSN })
       .filter(obj => obj.sql)
       .reduce((previous, current) => {
         const hdiArtifactName = remapName(nameMapping[current.name], sqlCSN, k => !k.endsWith('.hdbindex'));
@@ -267,9 +269,9 @@ function hdi(csn, options = {}) {
         return previous;
       }, Object.create(null));
 
-    // now add the not-sorted stuff, like indizes
-    Object.keys(sqlsNotToSort).forEach((key) => {
-      sorted[remapName(key, sqlCSN, k => !k.endsWith('.hdbindex'))] = sqlsNotToSort[key];
+    // now add the not-sorted stuff, like indices
+    forEach(sqlArtifactsNotToSort, (key) => {
+      sorted[remapName(key, sqlCSN, k => !k.endsWith('.hdbindex'))] = sqlArtifactsNotToSort[key];
     });
 
     return sorted;
@@ -290,10 +292,10 @@ function hdi(csn, options = {}) {
 function remapNames(dict, csn, filter) {
   const result = Object.create(null);
 
-  for (const [ key, value ] of Object.entries(dict)) {
+  forEach(dict, (key, value) => {
     const name = remapName(key, csn, filter);
     result[name] = value;
-  }
+  });
 
   return result;
 }
@@ -325,7 +327,7 @@ function remapName(key, csn, filter = () => true) {
  * Note: Only supports changes in entities (not views etc.) compiled/rendered as HANA-CSN/SQL.
  *
  * @param {CSN.Model}  csn          A clean input CSN representing the desired "after-image"
- * @param {hdiOptions} options      Options
+ * @param {HdiOptions} options      Options
  * @param {CSN.Model}  beforeImage  A HANA-transformed CSN representing the "before-image", or null in case no such image
  *                                  is known, i.e. for the very first migration step
  * @returns {object} - afterImage:  The desired after-image in HANA-CSN format
@@ -346,8 +348,8 @@ function hdiMigration(csn, options, beforeImage) {
    * This is for backward compatibility with @sap/cds@4.5.(2…3).
    *
    * @todo Remove in cds-compiler@2.x
-   * @param {hdiOptions|CSN.Model} inputOptions Options or CSN image
-   * @param {CSN.Model|hdiOptions} inputBeforeImage CSN image or options
+   * @param {HdiOptions|CSN.Model} inputOptions Options or CSN image
+   * @param {HdiOptions|CSN.Model} inputBeforeImage CSN image or options
    * @returns {Array} Array where the real options come first
    */
   function backwardCompatible(inputOptions, inputBeforeImage) {
@@ -395,15 +397,15 @@ function hdiMigration(csn, options, beforeImage) {
    */
   function createDefinitions() {
     const result = [];
-    for (const [ kind, artifacts ] of Object.entries(hdbkinds)) {
+    forEach(hdbkinds, (kind, artifacts) => {
       const suffix = `.${ kind }`;
-      for (const [ name, sqlStatement ] of Object.entries(artifacts)) {
+      forEach(artifacts, (name, sqlStatement) => {
         if ( kind !== 'hdbindex' )
           result.push({ name: getFileName(name, afterImage), suffix, sql: sqlStatement });
         else
           result.push({ name, suffix, sql: sqlStatement });
-      }
-    }
+      });
+    });
     return result;
   }
   /**
@@ -413,9 +415,7 @@ function hdiMigration(csn, options, beforeImage) {
    */
   function createDeletions() {
     const result = [];
-    for (const [ name ] of Object.entries(deletions))
-      result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' });
-
+    forEach(deletions, name => result.push({ name: getFileName(name, beforeImage), suffix: '.hdbtable' }));
     return result;
   }
   /**
@@ -425,9 +425,7 @@ function hdiMigration(csn, options, beforeImage) {
    */
   function createMigrations() {
     const result = [];
-    for (const [ name, changeset ] of Object.entries(migrations))
-      result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset });
-
+    forEach(migrations, (name, changeset) => result.push({ name: getFileName(name, afterImage), suffix: '.hdbmigrationtable', changeset }));
     return result;
   }
 }
@@ -438,7 +436,7 @@ hdi.migration = hdiMigration;
  * Process the given CSN into HDBCDS artifacts.
  *
  * @param {any} csn A clean input CSN
- * @param {hdbcdsOptions} [options={}] Options
+ * @param {HdbcdsOptions} [options={}] Options
  * @returns {HDBCDS} { <filename>:<content>, ...}
  */
 function hdbcds(csn, options = {}) {
@@ -585,12 +583,13 @@ function edmxall(csn, options = {}) {
  */
 function flattenResultStructure(toProcess) {
   const result = {};
-  for (const [ fileType, artifacts ] of Object.entries(toProcess)) {
+  forEach(toProcess, (fileType, artifacts) => {
     if (fileType === 'messages')
-      continue;
-    for (const filename of Object.keys(artifacts))
+      return;
+    forEach(artifacts, (filename) => {
       result[`${ filename }.${ fileType }`] = artifacts[filename];
-  }
+    });
+  });
 
   return result;
 }
@@ -643,12 +642,18 @@ function publishCsnProcessor( processor, _name ) {
       return processor( csn, options, ...args );
     }
     catch (err) {
-      if (err instanceof CompilationError || options.noRecompile)
-      // options.testMode && err instanceof RangeError) // stack overflow
+      if (err instanceof CompilationError || options.noRecompile || isPreTransformed(csn, 'odata')) // we cannot recompile a pre-transformed CSN
+        throw err;
+
+      if (options.testMode && !(err instanceof TypeError) &&
+        !(err instanceof ModelError))
         throw err;
 
       const { info } = makeMessageFunction( csn, options, 'compile' );
-      info( 'api-recompiled-csn', emptyLocation('csn.json'), {}, 'CSN input had to be recompiled' );
+      const msg = info( 'api-recompiled-csn', emptyLocation('csn.json'), {}, 'CSN input had to be recompiled' );
+      if (options.internalMsg)
+        msg.error = err; // Attach original error
+
       // next line to be replaced by CSN parser call which reads the CSN object
       const xsn = recompileX(csn, options);
       const recompiledCsn = compactModel(xsn);
@@ -682,12 +687,6 @@ function publishCsnProcessor( processor, _name ) {
  * @typedef {'plain' | 'quoted' | 'hdbcds' } NamingMode
  */
 
-/**
- * Available SQL change modes
- *
- * @typedef {'alter' | 'drop' } SqlChangeMode
- */
-
 /**
  * Available oData versions
  *
@@ -700,42 +699,6 @@ function publishCsnProcessor( processor, _name ) {
  * @typedef { 'structured' | 'flat' } oDataFormat
  */
 
-/**
- * Generally available options
- *
- * @typedef {object} Options
- * @property {object} [beta] Enable experimental features - not for productive use!
- * @property {boolean} [dependentAutoexposed=false] For dependent autoexposed entities (managed compositions, texts entity), follow name of base entity
- * @property {boolean} [longAutoexposed=false] Deprecated: Produce long names (with underscores) for autoexposed entities
- * @property {Map<string, number>} [severities={}] Map of message-id and severity that allows setting the severity for the given message
- * @property {Array} [messages] Allows collecting all messages in the options instead of printing them to stderr.
- */
-
-/**
- * Options available for to.hdi
- *
- * @typedef {object} hdiOptions
- * @property {NamingMode} [sqlMapping='plain'] Naming mode to use
- * @property {SqlChangeMode} [sqlChangeMode='alter'] SQL change mode to use (for changed columns)
- * @property {boolean} [allowCsnDowngrade=false] Allow downgrades of CSN major version (for modelCompare)
- * @property {object} [beta] Enable experimental features - not for productive use!
- * @property {boolean} [longAutoexposed=false] Deprecated: Produce long names (with underscores) for autoexposed entities
- * @property {Map<string, number>} [severities={}] Map of message-id and severity that allows setting the severity for the given message
- * @property {Array} [messages] Allows collecting all messages in the options instead of printing them to stderr.
- */
-
-/**
- * Options available for to.hdbcds
- *
- * @typedef {object} hdbcdsOptions
- * @property {NamingMode} [sqlMapping='plain'] Naming mode to use
- * @property {object} [beta] Enable experimental features - not for productive use!
- * @property {boolean} [longAutoexposed=false] Deprecated: Produce long names (with underscores) for autoexposed entities
- * @property {Map<string, number>} [severities={}] Map of message-id and severity that allows setting the severity for the given message
- * @property {Array} [messages] Allows collecting all messages in the options instead of printing them to stderr.
- */
-
-
 /**
  * A fresh (just compiled, not transformed) CSN
  *
@@ -755,13 +718,13 @@ function publishCsnProcessor( processor, _name ) {
  */
 
 /**
- * A map of { <file.hdbcds>:<content> }.
+ * A map of { <file.hdbcds|hdbconstraint>:<content> }.
  *
  * @typedef {object} HDBCDS
  */
 
 /**
- * A map of { <file.hdbtable/view...>:<content> }.
+ * A map of { <file.hdbtable|hdbview|hdbconstraint...>:<content> }.
  *
  * @typedef {object} HDIArtifacts
  */

package/lib/api/options.js

@@ -49,7 +49,7 @@ const privateOptions = [
   'traceParserAmb',
   'testMode',
   'testSortCsn',
-  'constraintsAsAlter',
+  'constraintsInCreateTable',
   'integrityNotEnforced',
   'integrityNotValidated',
   'assertIntegrity',
@@ -80,13 +80,12 @@ const overallOptions = publicOptionsNewAPI.concat(privateOptions);
 function translateOptions(input = {}, defaults = {}, hardRequire = {},
                           customValidators = {}, combinationValidators = [], moduleName = '') {
   const options = Object.assign({}, defaults);
-  const inputOptionNames = Object.keys(input);
   for (const name of overallOptions) {
     // Ensure that arrays are not passed as a reference!
     // This caused issues with the way messages are handled in processMessages
-    if (Array.isArray(input[name]) && inputOptionNames.includes(name))
+    if (Array.isArray(input[name]))
       options[name] = [ ...input[name] ];
-    else if (inputOptionNames.includes(name))
+    else if (Object.hasOwnProperty.call(input, name))
       options[name] = input[name];
   }
 
@@ -158,7 +157,7 @@ module.exports = {
     sql: (options) => {
       const hardOptions = { src: 'sql' };
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'plain' };
-      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'sql-dialect-and-naming', 'constraints-as-alter-sqlite' ], 'to.sql');
+      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'sql-dialect-and-naming' ], 'to.sql');
 
       const result = Object.assign({}, processed);
       result.toSql = Object.assign({}, processed);
@@ -166,7 +165,7 @@ module.exports = {
       return result;
     },
     hdi: (options) => {
-      const hardOptions = { src: 'hdi', constraintsAsAlter: false };
+      const hardOptions = { src: 'hdi' };
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana' };
       const processed = translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdi');
 

package/lib/api/validate.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { makeMessageFunction } = require('../base/messages');
+const { forEach } = require('../utils/objectUtils');
 
 /* eslint-disable arrow-body-style */
 const booleanValidator = {
@@ -142,11 +143,6 @@ const allCombinationValidators = {
     severity: 'warning',
     getMessage: () => 'Option "beta" was used. This option should not be used in productive scenarios!',
   },
-  'constraints-as-alter-sqlite': {
-    validate: options => options.constraintsAsAlter && options.sqlDialect && options.sqlDialect === 'sqlite',
-    severity: 'warning',
-    getMessage: options => `Option 'constraintsAsAlter' is ignored for sqlDialect '${ options.sqlDialect }'`,
-  },
 };
 /* eslint-disable jsdoc/no-undefined-types */
 /**
@@ -164,16 +160,15 @@ function validate(options, moduleName, customValidators = {}, combinationValidat
   // TODO: issuing messages in this function looks very strange...
   {
     const messageCollector = { messages: [] };
-    const { error, throwWithError } = makeMessageFunction(null, messageCollector, moduleName);
+    const { error, throwWithAnyError } = makeMessageFunction(null, messageCollector, moduleName);
 
-    for (const optionName of Object.keys(options)) {
-      const optionValue = options[optionName];
+    forEach(options, (optionName, optionValue) => {
       const validator = customValidators[optionName] || validators[optionName] || booleanValidator;
 
       if (!validator.validate(optionValue))
         error('invalid-option', null, {}, `Expected option "${ optionName }" to have "${ validator.expected(optionValue) }". Found: "${ validator.found(optionValue) }"`);
-    }
-    throwWithError();
+    });
+    throwWithAnyError();
   }
 
   const message = makeMessageFunction(null, options, moduleName);
@@ -184,7 +179,7 @@ function validate(options, moduleName, customValidators = {}, combinationValidat
       message[combinationValidator.severity]('invalid-option-combination', null, {}, combinationValidator.getMessage(options));
   }
 
-  message.throwWithError();
+  message.throwWithAnyError();
 }
 /* eslint-enable jsdoc/no-undefined-types */
 

package/lib/backends.js

@@ -279,7 +279,7 @@ function transformSQLOptions(model, options) {
 
   if(options.toSql.dialect !== 'hana') {
     // CDXCORE-465, 'quoted' and 'hdbcds' are to be used in combination with dialect 'hana' only
-    if(['quoted', 'hdbcds'].includes(options.toSql.names)) {
+    if (options.toSql.names === 'quoted' || options.toSql.names === 'hdbcds') {
       error(null, null, `Option "{ toSql.dialect: '${options.toSql.dialect}' }" can't be combined with "{ toSql.names: '${options.toSql.names}' }"`);
     }
     // No non-HANA SQL for HDI
@@ -296,17 +296,17 @@ function transformSQLOptions(model, options) {
   // If among the options user, user.id or user.locale are specified via the CLI or
   // via the API, then ensure that at the end there is a user option, which is an object and has(have)
   // "id" and/or "locale" prop(s)
-  function transformUserOption(options) {
+  function transformUserOption(userOptions) {
     // move the user option value under user.id if specified as a string
-    if (options.user && typeof options.user === 'string' || options.user instanceof String) {
-      options.user = { id: options.user };
+    if (userOptions.user && typeof userOptions.user === 'string' || userOptions.user instanceof String) {
+      userOptions.user = { id: userOptions.user };
     }
     // move the locale option(if provided) under user.locale
-    if (options.locale) {
-      options.user = options.user
-        ? Object.assign(options.user, { locale: options.locale })
-        : { locale: options.locale };
-      delete options.locale;
+    if (userOptions.locale) {
+      userOptions.user = userOptions.user
+        ? Object.assign(userOptions.user, { locale: userOptions.locale })
+        : { locale: userOptions.locale };
+      delete userOptions.locale;
     }
   }
 }
@@ -389,7 +389,7 @@ function toRenameWithCsn(csn, options) {
   let forHanaCsn = transformForHanaWithCsn(csn, mergeOptions(options, { forHana : options.toRename } ), 'to.rename');
   // forHanaCsn looses empty contexts and services, add them again so that toRename can calculate the namespaces
   forEachDefinition(csn, (artifact, artifactName) => {
-    if(['context', 'service'].includes(artifact.kind) && forHanaCsn.definitions[artifactName] === undefined) {
+    if((artifact.kind === 'context' || artifact.kind === 'service') && forHanaCsn.definitions[artifactName] === undefined) {
       forHanaCsn.definitions[artifactName] = artifact;
     }
   });
@@ -416,6 +416,10 @@ function alterConstraintsWithCsn(csn, options) {
     names: names || 'plain'
   }
 
+  // Also set new-style options
+  options.sqlDialect = 'hana';
+  options.sqlMapping = names || 'plain';
+
   // Of course we want the database constraints
   options.assertIntegrityType = 'DB';
 
@@ -432,19 +436,7 @@ function alterConstraintsWithCsn(csn, options) {
   else
     intermediateResult = manageConstraints(forSqlCsn, mergedOptions);
 
-  if(options.testMode !== true)
-    return intermediateResult;
-
-  // if in testmode, return a string containing all the artifacts
-  let resultString = '';
-  const extension = src && src === 'hdi' ? 'hdbconstraint' : 'sql';
-  for(const id in intermediateResult){
-    const initialComment = `--$ --- ${id}.${extension} ---\n\n`;
-    resultString += initialComment;
-    resultString += intermediateResult[id];
-    resultString += '\n\n'
-  }
-  return resultString;
+  return intermediateResult;
 }
 
 // ----------- toCsn -----------

package/lib/base/dictionaries.js

@@ -89,17 +89,9 @@ function pushToDict( dict, name, entry ) {
     dict[name] = [entry];
 }
 
-function forEachInDict( dict, callback ) {
-  let r = Object.create(null);
-  for (let name of Object.keys(dict))
-    r[name] = callback( dict[name], name, dict );
-  return r;
-}
-
 module.exports = {
   dictAdd, dictForEach,
   dictAddArray,
   pushToDict,
-  forEachInDict,
 }
 

package/lib/base/error.js

@@ -0,0 +1,26 @@
+'use strict';
+
+/**
+ * Use this class to indicate that an internal error was noticed.
+ * In testMode, these errors do _not_ trigger a recompilation.
+ */
+class CompilerAssertion extends Error {
+  constructor(message) {
+    super(message);
+  }
+}
+
+/**
+ * Use this class to indicate that something with the input CSN is wrong,
+ * which will be caught by the core compiler through recompiling the sources.
+ */
+class ModelError extends Error {
+  constructor(message) {
+    super(message);
+  }
+}
+
+module.exports = {
+  CompilerAssertion,
+  ModelError,
+};