@sap/cds-compiler 2.5.0 → 2.10.4

package/CHANGELOG.md

@@ -7,6 +7,182 @@
 Note: `beta` fixes, changes and features are usually not listed in this ChangeLog but [here](doc/CHANGELOG_BETA.md).
 The compiler behavior concerning `beta` features can change at any time without notice.
 
+## Version 2.10.4 - 2021-11-05
+
+### Fixed
+
+- to.sql/hdi/hdbcds:
+  + Correctly complain about `exists` in conjunction with non-associations/compositions
+  + Don't resolve types in action returns, as this causes issues with $self-resolution
+
+- to.edm(x): Be robust against transitively untyped keys in stacked view hierarchies
+
+## Version 2.10.2 - 2021-10-29
+
+### Fixed
+
+- to.sql/hdi/hdbcds: Correctly handle `exists` in conjunction with mixin-associations
+
+## Version 2.10.0 - 2021-10-28
+
+### Added
+
+- Support arbitrary paths after `$user` - similar to `$session`.
+- Support scale `floating` and `variable` for `cds.Decimal` in CDL and CSN. Backend specific handling is descibed in their sections.
+- Allow select item wildcard (`*`) in a `select`/`projection` at any position, not just the first.
+
+- to.edm(x):
+  + In Odata V4 generate transitive navigation property binding paths along containment hierarchies and terminate on the
+    first non-containment association. The association target is either an explicit Edm.EntitySet in the same EntityContainer
+    or in a referred EntityContainer (cross service references) or an implicit EntitySet identified by the containment path
+    originating from an explicit EntitySet. This enhancement has an observable effect only in structured format with containment
+    turned on.
+  + Support for scales `variable` and `floating`:
+    + V4: `variable` and `floating` are rendered as `Scale="variable"`. Since V4 does not support `floating`, it is aproximated as `variable`.
+    + V2: `variable` and `floating` are announced via property annotation `sap:variable-scale="true"`
+  
+- to.sql/hdi/hdbcds:
+  + Reject scale `floating` and `variable`.
+  + Reject arbitrary `$user` or `$session` paths that cannot be translated to valid SQL.
+  + Following a valid `exists`, further `exists` can be used inside of the filter-expression: `exists assoc[exists another[1=1]]`
+  + `exists` can now be followed by more than one association step.
+  `exists assoc.anotherassoc.moreassoc` is semantically equivalent to `exists assoc[exists anotherassoc[exists moreassoc]]`
+
+### Changed
+
+- to.odata: Inform when overwriting draft action annotations like `@Common.DraftRoot.ActivationAction`.
+
+## Version 2.9.0 - 2021-10-15
+
+### Changed
+
+- to.edm(x): Raise `odata-spec-violation-type` to a downgradable error.
+
+### Fixed
+
+- to.edm(x):
+  + Fix a bug in annotation propagation to foreign keys.
+  + Don't render annotations for not rendered stream element in V2.
+- to.hdi:
+  + for naming mode "hdbcds" and "quoted" parameter definitions are not quoted anymore.
+- to.hdi/sql/hdbcds:
+  + Correctly handle explicit and implicit alias during flattening.
+  + Raise an error for `@odata.draft.enabled` artifacts with elements without types - instead of crashing with internal assertions.
+
+## Version 2.8.0 - 2021-10-07
+
+### Added
+
+- Allow defining unmanaged associations in anonymous aspects of compositions.
+- Enable extensions of anonymous aspects for managed compositions of aspects.
+- When the option `addTextsLanguageAssoc` is set to true and
+  the model contains an entity `sap.common.Languages` with an element `code`,
+  all generated texts entities additionally contain an element `language`
+  which is an association to `sap.common.Languages` using element `local`.
+- for.odata:
+  + In `--odata-format=flat`, structured view parameters are flattened like elements.
+- to.hdbcds
+  + Use "smart quotes" for naming mode "plain" - automatically quote identifier which are reserved keywords or non-regular.
+
+### Changed
+
+- for.odata:
+  + In `--data-format=structured`, anonymous sub elements of primary keys and parameters are set to `notNull:true`,
+    an existing `notNull` attribute is _not_ overwritten. Referred named types are _not_ modified.
+- to.edm(x):
+  + Improve specification violation checks of (nested) keys:
+    + All (sub-)elements must be `Nullable: false` (error).
+    + Must represent a single value (error).
+    + In V4 must be a specification compliant Edm.PrimitiveType (warning).
+- to.hdi/hdbcds/sql: $user.\<xy\> now has \<xy\> added as alias - "$user.\<xy\> as \<xy\>"
+
+### Fixed
+
+- Properly generate auto-exposed entities for associations in parameters.
+- Correctly apply extensions to anonymous array item types.
+- Correctly apply/render annotations to anonymous action return types.
+- With CSN flavor `plain` (`gensrc`), correctly render annotations on elements
+  of referred structure types as `annotate` statements in the CSN's `extensions` property.
+- to.cdl:
+  + Correctly render extensions on array item types
+  + Correctly render annotations on action return types
+- to/for: Correctly handle CSN input where the prototype of objects is not the "default"
+- to.hdi:
+  + for naming mode "hdbcds" and "quoted" parameter definitions are now quoted.
+  + for naming mode "plain", smart quotation is applied to parameter definitions if they are reserved words.
+- to.hdi/hdbcds/sql:
+  + Ensure that cdl-style casts to localized types do not lose their localized property
+  + Fix a small memory leak during rendering of SQL/HDBCDS.
+- to.edm(x): Remove ambiguous `Partner` attribute from `NavigationProperty`. A forward association referred
+  to by multiple backlinks (`$self` comparisons) is no longer partner to an arbitrary backlink.
+
+## Version 2.7.0 - 2021-09-22
+
+### Added
+
+- to.hdi.migration:
+  + Support changes to HANA comments.
+
+### Changed
+
+- Updated OData vocabularies 'Common', 'Core'
+
+### Fixed
+
+- Fix memory issue: do not keep reference to last-compiled model.
+- Fix dump which occured when trying to report that the user has defined an element to be both `key` and `localized` if
+  `localized` was inherited via the provided type, or in the generated entity for a managed composition of aspect.
+- Properly auto-expose targets of associations in parameters and `many`.
+- for.Odata:
+  + Fix handling of annotation `@cds.odata.valuelist` in conjunction with associations in structures using flat-mode and sqlMapping set to plain.
+  + Set correctly the $localized property in the OData backend resulting CSN for artifacts that have localized convenience views.
+- to.edm(x):
+  + Fix rendering of structured referential constraints and nested partnerships in combination with `$self` comparisons.
+  + Fix merging of `@Capabilities` annotations while transforming them into `NavigationCapabilities` from the containee into the container.
+- to.sql/hdi/hdbcds:
+  + Fix a bug in Association to Join translation in multi-level association redirection in combination with `$self`.
+  + Correctly flatten paths with filters or parameters.
+  + Improve error message in case of invalid `exists`.
+
+## Version 2.6.2 - 2021-08-26
+
+### Fixed
+
+- to.sql/hdi/hdbcds/edm(x)/for.odata: Correctly handle tuple expansion in subqueries of Unions.
+
+## Version 2.6.0 - 2021-08-23
+
+### Added
+
+- Support managed associations without foreign keys. Associations targeting a definition without primary keys or with an
+  explicit empty foreign key tuple or with empty structured elements as foreign keys and their corresponding `$self`
+  comparisons do not describe the relationship between the source and the target entity.
+  These associations can be used to establish API navigations but cannot be used to access elements in the target
+  entity as they cannot be transformed into a valid JOIN expression.
+  Consequently, these associations are not added to the `WITH ASSOCIATIONS` clause or forwarded to HANA CDS.
+- to.sql/hdi/hdbcds/edm(x)/for.odata: Structure/managed association comparisons (tuple comparisons) are now
+  also expanded in infix filters, all expressions and all on-conditions.
+- to.hdbcds: Better locations for messages - mostly concerning keywords and duplicates
+
+### Changed
+
+- to.sql/hdi/hdbcds: Invalid (i.e. not expandable) usage of structures is now checked - an error is raised
+
+### Removed
+
+- The internal non-enumerable CSN property `$env` has been removed from the compiled CSN.
+
+### Fixed
+
+- Make `;` optional before `}` in all circumstances (was not the case with `many`).
+- to.sql/hdi/hdbcds/edm(x): More graceful handling of CSN input where associations do not have `keys` or an `on`-condition
+
+## Version 2.5.2 - 2021-08-10
+
+### Fixed
+
+- to.hdbcds: Fixed a bug introduced with 2.5.0 that caused virtual elements to be rendered in views.
+
 ## Version 2.5.0 - 2021-07-28
 
 ### Added
@@ -47,19 +223,19 @@ The compiler behavior concerning `beta` features can change at any time without
   and 'Ignoring draft node for composition target ... because it is not part of a service'
 - Doc comments are no longer ignored after enum values and on view columns in parseCdl mode.
 - to.cdl:
-  - Doc comments for enum values are correctly rendered.
-  - Enum value and doc comments are now correctly rendered if the enum is called `doc`.
-  - Doc comments at type references are correctly rendered.
-  - Empty doc comments are correctly rendered and not left out.
-  - Doc comments on view columns are correctly rendered.
+  + Doc comments for enum values are correctly rendered.
+  + Enum value and doc comments are now correctly rendered if the enum is called `doc`.
+  + Doc comments at type references are correctly rendered.
+  + Empty doc comments are correctly rendered and not left out.
+  + Doc comments on view columns are correctly rendered.
 - to.edm(x):
-  - OData V2: Ignore `@odata.singleton`.
-  - OData V4: Do not render an `edm:NavigationPropertyBinding` to a singleton if the association has
+  + OData V2: Ignore `@odata.singleton`.
+  + OData V4: Do not render an `edm:NavigationPropertyBinding` to a singleton if the association has
     cardinality 'to-many'.
 - forOData:
-  - Fix automatic renaming of shortcut annotation (eg. `@label`) with value `null`.
+  + Fix automatic renaming of shortcut annotation (eg. `@label`) with value `null`.
 - CSN parser:
-  - Empty doc comments are correctly parsed and not complained about.
+  + Empty doc comments are correctly parsed and not complained about.
 
 ## Version 2.4.4 - 2021-07-02
 
@@ -477,6 +653,12 @@ synchronously.
 - to.hdi.migration: Don't generate `ALTER` for type change from association to composition or vice versa (if the rest stays the same),
   as the resulting SQL is  identical.
 
+## Version 1.50.10 - 2021-07-30
+
+### Fixed
+
+- to.hdi.migration: Check for incompatible CSN versions to avoid wrongly generated ALTER|DROP|ADD statements.
+
 ## Version 1.50.8 - 2021-07-01
 
 ### Fixed

package/bin/cdsc.js

@@ -411,7 +411,7 @@ function executeCommandLine(command, options, args) {
       if (options.rawOutput)
         console.error( util.inspect( reveal( err.model, options.rawOutput ), false, null ));
       else
-        displayMessages( err.model, err.errors );
+        displayMessages( err.model, err.messages );
       process.exitCode = 1;
     }
     else if (err instanceof compiler.InvocationError) {
@@ -528,7 +528,7 @@ function executeCommandLine(command, options, args) {
     fileName = fileName.replace(/[:/\\]/g, '_');
 
     // replace all dots with underscore to get deployable .hdbcds sources (except the one before the file extension)
-    if (options.toHana)
+    if (options.transformation === 'hdbcds')
       fileName = fileName.replace(/\.(?=.*?\.)/g, '_');
 
     if (!(content instanceof String || typeof content === 'string'))

package/doc/CHANGELOG_BETA.md

@@ -1,12 +1,43 @@
 # ChangeLog of Beta Features for cdx compiler and backends
 
 <!-- markdownlint-disable MD024 -->
+<!-- markdownlint-disable MD004 -->
 <!-- (no-duplicate-heading)-->
 
 Note: `beta` fixes, changes and features are listed in this ChangeLog just for information.
 The compiler behavior concerning `beta` features can change at any time without notice.
 **Don't use `beta` fixes, changes and features in productive mode.**
 
+## Version 2.10.4
+
+### Fixed `nestedProjections`
+
+- to.sql/hdi/hdbcds: Correctly handle a `*` at the not-first place in the query
+
+## Version 2.6.0
+
+### Removed `pretransformedCSN`
+
+### Removed `renderSql`
+
+### Removed `keylessManagedAssoc`
+
+This is now the default - see CHANGELOG entry for 2.6.0
+
+### Fixed `nestedProjections`
+
+- to.sql/hdi/hdbcds: now work correctly when nested projections are used
+
+### Fixed `foreignKeyConstraints`
+
+- Always use the name of the association / backlink compared to
+  `$self` as name suffix for a constraint
+- Composition of one always result in:
+  + ON DELETE RESTRICT
+  + ON UPDATE RESTRICT
+- Composition of one w/o backlink will result in a constraint in
+  the entity where the composition is defined
+
 ## Version 2.4.4
 
 ### Added `nestedProjections`
@@ -15,8 +46,8 @@ The compiler behavior concerning `beta` features can change at any time without
   `longer.ref as name { *, … } excluding { … }`, `{ col_expression1 as sub1, … } as name`, etc.
 - Support `inline`: columns can look like `assoc_or_struct_or_tabalias.{ col_expression1, … }`,
   `longer.ref[filter = condition].{ *, … } excluding { … }`, `assoc_or_struct_or_tabalias.*`, etc.
-- _Some checks are missing and will be added!  Minor changes might occur._
-- __The SQL backends might not work properly yet if nested projections are used!__
+- _Some checks are missing and will be added! Minor changes might occur._
+- **The SQL backends might not work properly yet if nested projections are used!**
 
 ## Version 2.4.2
 
@@ -30,7 +61,6 @@ The compiler behavior concerning `beta` features can change at any time without
   Consequently, these associations are not added to the `WITH ASSOCIATIONS` clause or forwarded to HANA CDS.
   Managed Associations without foreign keys must be enabled with `--beta: keylessManagedAssoc`
 
-
 ## Version 2.4.0
 
 ### Changed `foreignKeyConstraints`

package/lib/api/main.js

@@ -4,15 +4,18 @@
 
 const prepareOptions = require('./options');
 const backends = require('../backends');
-const { setProp, isBetaEnabled } = require('../base/model');
+const { setProp } = require('../base/model');
 const { emptyLocation } = require('../base/location');
-const { CompilationError, makeMessageFunction, deduplicateMessages } = require('../base/messages');
-const { compactModel } = require('../json/to-csn');
+const { CompilationError, makeMessageFunction } = require('../base/messages');
+const { recompileX } = require('../compiler/index');
+const { compactModel, sortCsn } = require('../json/to-csn');
 const { transform4odataWithCsn } = require('../transform/forOdataNew.js');
 const { toSqlDdl } = require('../render/toSql');
 const { compareModels } = require('../modelCompare/compare');
 const sortViews = require('../model/sortViews');
 const { getResultingName } = require('../model/csnUtils');
+const timetrace = require('../utils/timetrace');
+const { transformForHanaWithCsn } = require('../transform/forHanaNew');
 
 /**
  * Return the artifact name for use for the hdbresult object
@@ -31,10 +34,10 @@ const propertyToCheck = {
 };
 
 const { cloneCsn } = require('../model/csnUtils');
+const { toHdbcdsSource } = require('../render/toHdbcds');
 
 const relevantGeneralOptions = [ /* for future generic options */ ];
 const relevantOdataOptions = [ 'sqlMapping', 'odataFormat' ];
-const relevantSqlOptions = [ 'sqlMapping', 'sqlDialect' ];
 const warnAboutMismatchOdata = [ 'odataVersion' ];
 
 /**
@@ -188,8 +191,11 @@ function forHdi(csn, options = {}) {
  */
 function forHdbcds(csn, options = {}) {
   const internalOptions = prepareOptions.to.hdbcds(options);
-  internalOptions.toHana.csn = true;
-  return backends.toHanaWithCsn(csn, internalOptions).csn;
+  internalOptions.transformation = 'hdbcds';
+
+  const hanaCsn = transformForHanaWithCsn(csn, internalOptions, 'to.hdbcds');
+
+  return internalOptions.testMode ? sortCsn(hanaCsn, internalOptions) : hanaCsn;
 }
 
 /**
@@ -205,18 +211,7 @@ function sql(csn, options = {}) {
   // we need the CSN for view sorting
   internalOptions.toSql.csn = true;
 
-  let intermediateResult;
-  if (isBetaEnabled(internalOptions, 'pretransformedCSN') && isPreTransformed(csn, 'sql')) {
-    internalOptions.noRecompile = true; // pre-transformed cannot be recompiled!
-    checkPreTransformedCsn(csn, internalOptions, relevantSqlOptions, warnAboutMismatchOdata, 'to.sql');
-
-    intermediateResult = backends.renderSqlWithCsn(csn, internalOptions);
-    // attach CSN for view sorting
-    intermediateResult.csn = cloneCsn(csn, internalOptions);
-  }
-  else {
-    intermediateResult = backends.toSqlWithCsn(csn, internalOptions);
-  }
+  const intermediateResult = backends.toSqlWithCsn(csn, internalOptions);
 
   const result = sortViews(intermediateResult);
 
@@ -445,10 +440,15 @@ hdi.migration = hdiMigration;
  * @returns {HDBCDS} { <filename>:<content>, ...}
  */
 function hdbcds(csn, options = {}) {
+  timetrace.start('to.hdbcds');
   const internalOptions = prepareOptions.to.hdbcds(options);
-  const intermediateResult = backends.toHanaWithCsn(csn, internalOptions);
+  internalOptions.transformation = 'hdbcds';
+
+  const hanaCsn = forHdbcds(csn, internalOptions);
 
-  return flattenResultStructure(intermediateResult);
+  const result = flattenResultStructure(toHdbcdsSource(hanaCsn, internalOptions));
+  timetrace.stop();
+  return result;
 }
 /**
  * Generate a edm document for the given service
@@ -494,19 +494,17 @@ function edmall(csn, options = {}) {
   if (internalOptions.version === 'v2')
     error(null, null, 'OData JSON output is not available for OData V2');
 
-  let servicesAll;
-
   const result = {};
+  let oDataCsn = csn;
 
-  if (isPreTransformed(csn, 'odata')) {
+  if (isPreTransformed(csn, 'odata'))
     checkPreTransformedCsn(csn, internalOptions, relevantOdataOptions, warnAboutMismatchOdata, 'for.odata');
-    servicesAll = backends.preparedCsnToEdmAll(csn, internalOptions);
-  }
-  else {
-    const oDataCsn = odataInternal(csn, internalOptions);
-    servicesAll = backends.preparedCsnToEdmAll(oDataCsn, internalOptions);
-  }
-  const services = servicesAll.edmj;
+
+  else
+    oDataCsn = odataInternal(csn, internalOptions);
+
+  const servicesJson = backends.preparedCsnToEdmAll(oDataCsn, internalOptions);
+  const services = servicesJson.edmj;
   for (const serviceName in services) {
     const lEdm = services[serviceName];
     // FIXME: Why only metadata_json - isn't this rather a 'combined_json' ? If so, rename it!
@@ -595,41 +593,6 @@ function flattenResultStructure(toProcess) {
   return result;
 }
 
-/**
- * Compute the .hdbcds files that would have been generated by the csn for an undeploy.json.
- * This is needed for the handover between hdbcds and hdbtable - the existing hdbcds artifacts need to be undeployed.
- *
- * @param {any} csn A clean input CSN
- * @param {hdbcdsOptions} [options={}] Options
- * @returns {string[]} Array of .hdbcds filenames
- */
-function undeploy(csn, options) {
-  const hdbcdsResult = hdbcds(csn, options);
-
-  return Object.keys(hdbcdsResult);
-}
-
-/**
- * This function simply renders the given CSN to SQL - no integrity checks, no transformations, no guarantees for correctness.
- * Strictly for internal evaluation!
- *
- * @param {CSN.Model} csn A CSN - for things to work correctly, this is expected to be a DB transformed CSN. Plain CSN might work - or might not.
- * @param {sqlOptions} [options={}] Options
- * @returns {SQL[]} Array of SQL statements, tables first, views second - the resulting statements might not be a consistent, deployable state!
- */
-function renderSQL(csn, options) {
-  const internalOptions = prepareOptions.to.sql(options);
-  if (!isBetaEnabled(internalOptions, 'renderSQL'))
-    throw new Error('renderSQL is only available with beta-flag "renderSQL".');
-
-
-  // Add flag so it thinks we ran through forHanaNew
-  internalOptions.forHana = true;
-
-  const sqlResult = toSqlDdl(csn, internalOptions);
-  return Object.values(flattenResultStructure(sqlResult));
-}
-
 module.exports = {
   odata: publishCsnProcessor(odata, 'for.odata'),
   cdl: publishCsnProcessor(cdl, 'to.cdl'),
@@ -642,45 +605,10 @@ module.exports = {
   for_sql: publishCsnProcessor(forSql, 'for.sql'),
   for_hdi: publishCsnProcessor(forHdi, 'for.hdi'),
   for_hdbcds: publishCsnProcessor(forHdbcds, 'for.hdbcds'),
-  renderSQL,
-  undeploy,
   /** */
 };
 
 
-/**
- * Recompile the given CSN
- *
- * @param {object} csn Input CSN to recompile to XSN
- * @param {object} options Options
- * @returns {object} XSN
- *
- * TODO: move to lib/compiler/, consider new $recompile option, probaby issue
- * message api-recompiled-csn there.
- */
-function recompile(csn, options) {
-  // TODO: is it really a good idea to set options in the input parameter?
-  // (as long as we have the messages meddling of the option processor...)
-  // OK, I try a copy
-  options = { ...options };
-  // Explicitly set parseCdl to false because backends cannot handle
-  // the option and is only intended for CDL sources.
-  options.parseCdl = false;     // TODO: delete this option
-  // Explicitly delete all toCsn options
-  delete options.toCsn;
-  /* eslint-disable global-require */
-  const { augment } = require('../json/from-csn');
-  const { compileSourcesX } = require('../compiler');
-  /* eslint-enable global-require */
-  const file = csn.$location && csn.$location.file &&
-    csn.$location.file.replace(/[.]cds$/, '.cds.csn') || '<recompile>.csn';
-  const xsn = augment(csn, file, options); // in-place
-  const compiled = compileSourcesX( { [file]: xsn }, { ...options, $recompile: true } );
-  if (options.messages)
-    deduplicateMessages(options.messages);
-  return compiled;
-}
-
 /**
  * @param {any} processor CSN processor
  * @param {string} _name Name of the processor
@@ -720,7 +648,7 @@ function publishCsnProcessor( processor, _name ) {
       const { info } = makeMessageFunction( csn, options, 'compile' );
       info( 'api-recompiled-csn', emptyLocation('csn.json'), {}, 'CSN input had to be recompiled' );
       // next line to be replaced by CSN parser call which reads the CSN object
-      const xsn = recompile(csn, options);
+      const xsn = recompileX(csn, options);
       const recompiledCsn = compactModel(xsn);
       return processor( recompiledCsn, options, ...args );
     }

package/lib/api/options.js

@@ -10,11 +10,13 @@ const publicOptionsNewAPI = [
   // GENERAL
   'beta',
   'deprecated',
+  'addTextsLanguageAssoc',
   'localizedLanguageFallback',  // why can't I define the option type here?
   'severities',
   'messages',
   'withLocations',
   'defaultStringLength',
+  'csnFlavor',
   // DB
   'sqlDialect',
   'sqlMapping',
@@ -68,10 +70,11 @@ const overallOptions = publicOptionsNewAPI.concat(privateOptions);
  * @param {FlatOptions} [hardRequire={}] Hard requirements to enforce
  * @param {object} [customValidators] Custom validations to run instead of defaults
  * @param {string[]} [combinationValidators] Option combinations to validate
+ * @param {string} moduleName The called module, e.g. 'for.odata', 'to.hdi'. Needed to initialize the message functions
  * @returns {TranslatedOptions} General cds options
  */
 function translateOptions(input = {}, defaults = {}, hardRequire = {},
-                          customValidators = {}, combinationValidators = []) {
+                          customValidators = {}, combinationValidators = [], moduleName = '') {
   const options = Object.assign({}, defaults);
   const inputOptionNames = Object.keys(input);
   for (const name of overallOptions) {
@@ -90,6 +93,7 @@ function translateOptions(input = {}, defaults = {}, hardRequire = {},
   // Validate the filtered input options
   // only "new-style" options are here
   validate(options,
+           moduleName,
            // TODO: is there a better place to specify the type of option values?
            Object.assign( {
              localizedLanguageFallback: generateStringValidator([ 'none', 'coalesce' ]),
@@ -141,11 +145,11 @@ function translateOptions(input = {}, defaults = {}, hardRequire = {},
 
 module.exports = {
   to: {
-    cdl: options => translateOptions(options),
+    cdl: options => translateOptions(options, undefined, undefined, undefined, undefined, 'to.cdl'),
     sql: (options) => {
       const hardOptions = { src: 'sql' };
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'plain' };
-      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'sql-dialect-and-naming' ]);
+      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'sql-dialect-and-naming' ], 'to.sql');
 
       const result = Object.assign({}, processed);
       result.toSql = Object.assign({}, processed);
@@ -155,7 +159,7 @@ module.exports = {
     hdi: (options) => {
       const hardOptions = { src: 'hdi' };
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana' };
-      const processed = translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) });
+      const processed = translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdi');
 
       const result = Object.assign({}, processed);
       result.toSql = Object.assign({}, processed);
@@ -164,17 +168,17 @@ module.exports = {
     },
     hdbcds: (options) => {
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana' };
-      const processed = translateOptions(options, defaultOptions, {}, { sqlDialect: generateStringValidator([ 'hana' ]) });
+      const processed = translateOptions(options, defaultOptions, {}, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdbcds');
 
       const result = Object.assign({}, processed);
-      result.toHana = Object.assign({}, processed);
+      result.forHana = Object.assign({}, processed);
 
       return result;
     },
     edm: (options) => {
       const hardOptions = { json: true, combined: true };
       const defaultOptions = { odataVersion: 'v4', odataFormat: 'flat' };
-      const processed = translateOptions(options, defaultOptions, hardOptions, { odataVersion: generateStringValidator([ 'v4' ]) }, [ 'valid-structured' ]);
+      const processed = translateOptions(options, defaultOptions, hardOptions, { odataVersion: generateStringValidator([ 'v4' ]) }, [ 'valid-structured' ], 'to.edm');
 
       const result = Object.assign({}, processed);
       result.toOdata = Object.assign({}, processed);
@@ -186,7 +190,7 @@ module.exports = {
       const defaultOptions = {
         odataVersion: 'v4', odataFormat: 'flat',
       };
-      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'valid-structured' ]);
+      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'valid-structured' ], 'to.edmx');
 
       const result = Object.assign({}, processed);
       result.toOdata = Object.assign({}, processed);
@@ -198,7 +202,7 @@ module.exports = {
 
     odata: (options) => {
       const defaultOptions = { odataVersion: 'v4', odataFormat: 'flat' };
-      const processed = translateOptions(options, defaultOptions, undefined, undefined, [ 'valid-structured' ]);
+      const processed = translateOptions(options, defaultOptions, undefined, undefined, [ 'valid-structured' ], 'for.odata');
 
       const result = Object.assign({}, processed);
       result.toOdata = Object.assign({}, processed);
@@ -208,10 +212,10 @@ module.exports = {
     },
     hana: (options) => {
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana' };
-      const processed = translateOptions(options, defaultOptions);
+      const processed = translateOptions(options, defaultOptions, undefined, undefined, undefined, 'for.hana');
 
       const result = Object.assign({}, processed);
-      result.toHana = Object.assign({}, processed);
+      result.forHana = Object.assign({}, processed);
 
 
       return result;