@sap/cds-compiler 2.10.2 → 2.11.4

package/CHANGELOG.md

@@ -7,6 +7,95 @@
 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.11.4 - 2021-12-21
+
+### Fixed
+
+- CDL parser: in many situations, improve message when people use reserved keywords as identifier
+- Improve error text and error location for ambiguious auto-redirection target
+- to.sql/hdi/hdbcds:
+  + Correctly detect `exists` in projections
+  + Correctly handle elements starting with `$` in the on-condition of associations
+  + Correctly handle sub queries in an entity defined with `projection on`
+  + Correctly handle associations in sub queries in a `from` of a sub query
+  + foreign key constraints: respect @assert.integrity: false for compositions
+- to.hdbcds: Correctly quote elements named `$self` and `$projection`
+- to.cdl: `when` was added to the keyword list for smart quoting
+- Compiler support for code completion for `$user` and `$session` now respect user
+  provided variables in `options.variableReplacements`.
+- API: `deduplicateMessages()` no longer removes messages for `duplicate` artifact/annotation errors.
+  Prior to this version, only one of the duplicated artifacts had a message, leaving the user to
+  guess where the other duplicates were.
+
+
+## Version 2.11.2 - 2021-12-06
+
+### Fixed
+
+- to.sql/hdi/hdbcds:
+  + No foreign key constraint will be rendered for managed `composition of one` if annotated with `@assert.integrity: false`
+  + Correctly handle managed associations with other managed associations as foreign keys in conjunction with `exists`
+
+## Version 2.11.0 - 2021-12-02
+
+### Added
+
+- Option `defaultBinaryLength` to set a `length` type facet for all definitions with type `cds.Binary`. This option
+  overrides the default binary length in the database backends and is also used as `MaxLength` attribute in Odata.
+- If doc-comments are ignored by the compiler, an info message is now emitted.  A doc-comment is ignored,
+  if it can't be assigned to an artifact.  For example for two subsequent doc-comments, the first doc-comment
+  is ignored.  To suppress these info messages, explicitly set option `docComment` to `false`.
+- `cdsc`:
+  + `cdsc explain list` can now be used to get a list of message IDs with explanation texts.
+  + `cdsc` now respects the environment variable `NO_COLOR`. If set, no ANSI escape codes will be used.
+    Can be overwritten by `cdsc --color always`.
+- to.sql/hdi: Support SQL Window Functions
+- to.sql/hdi/hdbcds:
+  + Support configuration of `$session` and `$user` via option `variableReplacements`.
+  + Restricted support for SQL foreign key constraints if option `assertIntegrityType` is set to `"DB"`.
+    The behavior of this feature might change in the future.
+
+### Changed
+
+- Updated OData vocabularies 'Common' and 'UI'.
+- to.sql/hdi/hdbcds: The default length of `cds.Binary` is set to `5000` similar to `cds.String`.
+
+### Removed
+
+- to.hdbcds: Doc comments on view columns are not rendered anymore. Doc comments on string literals will make the deployment fail
+  as the SAP HANA CDS compiler concatenates the doc comment with the string literal. Besides that, doc comments on view columns
+  are not transported to the database by SAP HANA CDS.
+- to.hdbcds/sql/hdi: Forbid associations in filters after `exists` (except for nested `exists`), as the final behavior is not yet specified.
+
+### Fixed
+
+- CSN parser: doc-comment extensions are no longer ignored.
+- Properly check for duplicate annotation definitions.
+- Correctly apply annotations on inherited enum symbols.
+- Correctly apply annotations on elements in an inherited structure array.
+- Fix a bug in API `defaultStringLength` value evaluation.
+- Fix crash if named arguments are used in a function that's inside a `CASE` statement.
+- to.sql/hdi/hdbcds:
+  + Properly flatten ad-hoc defined elements in `returns` / `params` of `actions` and `functions`.
+  + Correctly handle `*` in non-first position.
+  + Correctly handle action return types
+  + Correctly handle mixin association named `$self`
+- to.cdl: doc-comments are no longer rendered twice.
+- to.edm(x):
+  + Fix a bug in V2/V4 partner ship calculation.
+  + Remove warning of unknown types for Open Types in `@Core.Dictionary`.
+  + An empty CSN no longer results in a JavaScript type error
+
+## 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
@@ -38,13 +127,9 @@ The compiler behavior concerning `beta` features can change at any time without
   + `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]]`
 
-### Removed
-
 ### Changed
 
-- to.odata: Inform when overwriting draft action annotations like @Common.DraftRoot.ActivationAction.
-
-### Fixed
+- to.odata: Inform when overwriting draft action annotations like `@Common.DraftRoot.ActivationAction`.
 
 ## Version 2.9.0 - 2021-10-15
 

package/bin/.eslintrc.json

@@ -11,7 +11,6 @@
     "no-process-exit": "off",
     "camelcase": "off",
     "radix": "off",
-    // should probably be on
-    "no-shadow": "off"
+    "no-shadow": "warn"
   }
 }

package/bin/cds_update_identifiers.js

@@ -24,6 +24,7 @@
 'use strict';
 
 const parseLanguage = require('../lib/language/antlrParser');
+const { createMessageFunctions } = require('../lib/base/messages');
 
 const fs = require('fs');
 const path = require('path');
@@ -51,10 +52,11 @@ process.exit(0); // success
 
 function modernizeIdentifierStyle(source, filename) {
   const options = { messages: [], attachTokens: true };
+  const messageFunctions = createMessageFunctions( options, 'parse', null );
 
   // parseLanguage does not throw on CompilationError, so
   // we do not need a try...catch block.
-  const ast = parseLanguage(source, filename, options);
+  const ast = parseLanguage(source, filename, options, messageFunctions);
 
   // To avoid spam, only report errors.
   // Users should use the compiler to get all messages.

package/bin/cdsc.js

@@ -26,8 +26,10 @@ const path = require('path');
 const { reveal } = require('../lib/model/revealInternalProperties');
 const enrichCsn = require('../lib/model/enrichCsn');
 const { optionProcessor } = require('../lib/optionProcessor');
-const { explainMessage, hasMessageExplanation, sortMessages } = require('../lib/base/messages');
-const term = require('../lib/utils/term');
+const {
+  explainMessage, hasMessageExplanation, sortMessages, messageIdsWithExplanation,
+} = require('../lib/base/messages');
+const { term } = require('../lib/utils/term');
 const { splitLines } = require('../lib/utils/file');
 const { addLocalizationViews } = require('../lib/transform/localized');
 const { availableBetaFlags } = require('../lib/base/model');
@@ -52,9 +54,11 @@ function remapCmdOptions(options, cmdOptions) {
         options.sqlMapping = value;
         break;
       case 'user':
-        if (!options.magicVars)
-          options.magicVars = {};
-        options.magicVars.user = value;
+        if (!options.variableReplacements)
+          options.variableReplacements = {};
+        if (!options.variableReplacements.$user)
+          options.variableReplacements.$user = {};
+        options.variableReplacements.$user.id = value;
         break;
       case 'dialect':
         options.sqlDialect = value;
@@ -63,9 +67,11 @@ function remapCmdOptions(options, cmdOptions) {
         options.odataVersion = value;
         break;
       case 'locale':
-        if (!options.magicVars)
-          options.magicVars = {};
-        options.magicVars.locale = value;
+        if (!options.variableReplacements)
+          options.variableReplacements = {};
+        if (!options.variableReplacements.$user)
+          options.variableReplacements.$user = {};
+        options.variableReplacements.$user.locale = value;
         break;
       default:
         options[key] = value;
@@ -124,8 +130,6 @@ try {
       global.cds = {};
     global.cds.home = cmdLine.options.cdsHome;
   }
-  // Default color mode is 'auto'
-  term.useColor(cmdLine.options.color || 'auto');
 
   // Set default command if required
   cmdLine.command = cmdLine.command || 'toCsn';
@@ -137,10 +141,7 @@ try {
   if (cmdLine.command === 'parseCdl') {
     cmdLine.command = 'toCsn';
     cmdLine.options.parseCdl = true;
-    if (cmdLine.args.files.length > 1) {
-      const err = `'parseCdl' expects exactly one file! ${cmdLine.args.files.length} provided.`;
-      displayUsage(err, optionProcessor.commands.parseCdl.helpText, 2);
-    }
+    cmdLine.args.files = [ cmdLine.args.file ];
   }
 
   if (cmdLine.options.directBackend)
@@ -155,6 +156,21 @@ try {
     });
   }
 
+  // remap string values for `assertIntegrity` option to boolean
+  if (cmdLine.options.assertIntegrity &&
+      cmdLine.options.assertIntegrity === 'true' ||
+      cmdLine.options.assertIntegrity === 'false'
+  )
+    cmdLine.options.assertIntegrity = cmdLine.options.assertIntegrity === 'true';
+
+  // remap string values for `constraintsAsAlter` option to boolean
+  if (cmdLine.options.constraintsAsAlter &&
+    cmdLine.options.constraintsAsAlter === 'true' ||
+    cmdLine.options.constraintsAsAlter === 'false'
+  )
+    cmdLine.options.constraintsAsAlter = cmdLine.options.constraintsAsAlter === 'true';
+
+
   // Enable all beta-flags if betaMode is set to true
   if (cmdLine.options.betaMode)
     cmdLine.options.beta = availableBetaFlags;
@@ -231,6 +247,8 @@ function executeCommandLine(command, options, args) {
   if (options.out && options.out !== '-' && !fs.existsSync(options.out))
     fs.mkdirSync(options.out);
 
+  // Default color mode is 'auto'
+  const colorTerm = term(options.color || 'auto');
 
   // Add implementation functions corresponding to commands here
   const commands = {
@@ -393,14 +411,15 @@ function executeCommandLine(command, options, args) {
   }
 
   function explain() {
-    if (args.length !== 1)
-      displayUsage('Command \'explain\' expects exactly one message-id.', optionProcessor.commands.explain.helpText, 2);
+    if (args.messageId === 'list') {
+      console.log(messageIdsWithExplanation().join('\n'));
+      throw new ProcessExitError(0);
+    }
 
-    const id = args.files[0];
-    if (!hasMessageExplanation(id))
-      console.error(`Message '${id}' does not have an explanation!`);
+    if (!hasMessageExplanation(args.messageId))
+      console.error(`Message '${args.messageId}' does not have an explanation!`);
     else
-      console.log(explainMessage(id));
+      console.log(explainMessage(args.messageId));
   }
 
   // Display error messages in `err` resulting from a compilation.  Also set
@@ -464,16 +483,20 @@ function executeCommandLine(command, options, args) {
         hasAtLeastOneExplanation = hasAtLeastOneExplanation || main.hasMessageExplanation(msg.messageId);
         const name = msg.location && msg.location.file;
         const fullFilePath = name ? path.resolve('', name) : undefined;
-        const context = fullFilePath && sourceLines(fullFilePath);
+        const context = fullFilePath ? sourceLines(fullFilePath) : [];
         log(main.messageStringMultiline(msg, {
-          normalizeFilename, noMessageId: !options.showMessageId, withLineSpacer: true, hintExplanation: true,
+          normalizeFilename,
+          noMessageId: !options.showMessageId,
+          withLineSpacer: true,
+          hintExplanation: true,
+          color: options.color,
         }));
         if (context)
-          log(main.messageContext(context, msg));
+          log(main.messageContext(context, msg, { color: options.color }));
         log(); // newline
       });
       if (options.showMessageId && hasAtLeastOneExplanation)
-        log(`${term.help('help')}: Messages marked with '…' have an explanation text. Use \`cdsc explain <message-id>\` for a more detailed error description.`);
+        log(`${colorTerm.help('help')}: Messages marked with '…' have an explanation text. Use \`cdsc explain <message-id>\` for a more detailed error description.`);
     }
     return model;
   }
@@ -549,10 +572,11 @@ function executeCommandLine(command, options, args) {
   }
 
   function catchErrors(err) {
+    // @ts-ignore
     if (err instanceof Error && err.hasBeenReported)
       return;
     console.error( '' );
-    console.error( 'INTERNAL ERROR: %s', err );
+    console.error( 'INTERNAL ERROR:' );
     console.error( util.inspect(err, false, null) );
     console.error( '' );
     process.exitCode = 70;

package/bin/cdsse.js

@@ -11,6 +11,7 @@
 // Planned are: gotoDefinition, highlight (for syntax highighting).
 
 /* eslint no-console:off */
+// @ts-nocheck
 
 'use strict';
 

package/bin/cdsv2m.js

@@ -34,10 +34,11 @@ function usage( err ) {
 function ria() {
   const annotates = Object.create( null );
   const msgs = options.messages.filter( m => m.messageId === 'redirected-implicitly-ambiguous' );
-  // regex match on message text not for productive code!
+  // 'Choose via $(ANNO) one of $(SORTED_ARTS) as redirection target for $(TARGET) in … $(ART) otherwise'
+  // NOTE: regex match on message text not for productive code!
   for (const msgObj of msgs) {
     const matches = msgObj.message.match( /["“][^"”]+["”]/g );
-    matches.slice(2).forEach( (name) => {
+    matches.slice( 1, -2 ).forEach( (name) => {
       annotates[name.slice( 1, -1 )] = true;
     } );
   }

package/doc/CHANGELOG_BETA.md

@@ -8,6 +8,16 @@ Note: `beta` fixes, changes and features are listed in this ChangeLog just for i
 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.11.0
+
+### Removed `foreignKeyConstraints`
+
+## 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`

package/lib/api/.eslintrc.json

@@ -14,6 +14,8 @@
     "jsdoc"
   ],
   "rules": {
+    // Does not recognize TS types
+    "jsdoc/no-undefined-types": "off",
     // eslint-plugin-jsdoc warning
     "jsdoc/require-property": 0,
     // =airbnb, >eslint:

package/lib/api/main.js

@@ -14,7 +14,7 @@ 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 { timetrace } = require('../utils/timetrace');
 const { transformForHanaWithCsn } = require('../transform/forHanaNew');
 
 /**
@@ -135,7 +135,7 @@ function odataInternal(csn, internalOptions) {
  * Return a odata-transformed CSN
  *
  * @param {CSN.Model} csn Clean input CSN
- * @param {oDataOptions} [options={}] Options
+ * @param {ODataOptions} [options={}] Options
  * @returns {oDataCSN} Return an oData-pre-processed CSN
  */
 function odata(csn, options = {}) {
@@ -159,7 +159,7 @@ function cdl(csn, externalOptions = {}) {
  * Transform a CSN like to.sql
  *
  * @param {CSN.Model} csn Plain input CSN
- * @param {sqlOptions} [options={}] Options
+ * @param {SqlOptions} [options={}] Options
  * @returns {CSN.Model} CSN transformed like to.sql
  * @private
  */
@@ -202,7 +202,7 @@ function forHdbcds(csn, options = {}) {
  * Process the given CSN into SQL.
  *
  * @param {CSN.Model} csn A clean input CSN
- * @param {sqlOptions} [options={}] Options
+ * @param {SqlOptions} [options={}] Options
  * @returns {SQL[]} Array of SQL statements, tables first, views second
  */
 function sql(csn, options = {}) {
@@ -454,7 +454,7 @@ function hdbcds(csn, options = {}) {
  * Generate a edm document for the given service
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {oDataOptions} [options={}] Options
+ * @param {ODataOptions} [options={}] Options
  * @returns {edm} The JSON representation of the service
  */
 function edm(csn, options = {}) {
@@ -484,7 +484,7 @@ edm.all = edmall;
  * Generate edm documents for all services
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {oDataOptions} [options={}] Options
+ * @param {ODataOptions} [options={}] Options
  * @returns {edms} { <service>:<JSON representation>, ...}
  */
 function edmall(csn, options = {}) {
@@ -516,7 +516,7 @@ function edmall(csn, options = {}) {
  * Generate a edmx document for the given service
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {oDataOptions} [options={}] Options
+ * @param {ODataOptions} [options={}] Options
  * @returns {edmx} The XML representation of the service
  */
 function edmx(csn, options = {}) {
@@ -547,7 +547,7 @@ edmx.all = edmxall;
  * Generate edmx documents for all services
  *
  * @param {CSN|oDataCSN} csn Clean input CSN or a pre-transformed CSN
- * @param {oDataOptions} [options={}] Options
+ * @param {ODataOptions} [options={}] Options
  * @returns {edmxs} { <service>:<XML representation>, ...}
  */
 function edmxall(csn, options = {}) {
@@ -709,20 +709,6 @@ function publishCsnProcessor( processor, _name ) {
  * @property {Array} [messages] Allows collecting all messages in the options instead of printing them to stderr.
  */
 
-/**
- * Options available for all oData-based functions
- *
- * @typedef {object} oDataOptions
- * @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.
- * @property {oDataVersion} [odataVersion='v4'] Odata version to use
- * @property {oDataFormat} [odataFormat='flat'] Wether to generate oData as flat or as structured. Structured only with v4.
- * @property {NamingMode} [sqlMapping='plain'] Naming mode to use
- * @property {string} [service] If a single service is to be rendered
- */
-
 /**
  * Options available for to.hdi
  *
@@ -747,20 +733,6 @@ function publishCsnProcessor( processor, _name ) {
  * @property {Array} [messages] Allows collecting all messages in the options instead of printing them to stderr.
  */
 
-/**
- * Options available for to.sql
- *
- * @typedef {object} sqlOptions
- * @property {NamingMode} [sqlMapping='plain'] Naming mode to use
- * @property {SQLDialect} [sqlDialect='sqlite'] SQL dialect to use
- * @property {object} [magicVars] Object containing values for magic variables like "$user"
- * @property {string} [magicVars.locale] Value for the "$user.locale" in "sqlite" dialect
- * @property {string} [magicVars.user] Value for the "$user" variable in "sqlite" dialect
- * @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

package/lib/api/options.js

@@ -15,6 +15,7 @@ const publicOptionsNewAPI = [
   'severities',
   'messages',
   'withLocations',
+  'defaultBinaryLength',
   'defaultStringLength',
   'csnFlavor',
   // DB
@@ -23,7 +24,8 @@ const publicOptionsNewAPI = [
   'sqlChangeMode',
   'allowCsnDowngrade',
   'joinfk',
-  'magicVars',
+  'magicVars', // deprecated
+  'variableReplacements',
   // ODATA
   'odataVersion',
   'odataFormat',
@@ -47,9 +49,11 @@ const privateOptions = [
   'traceParserAmb',
   'testMode',
   'testSortCsn',
-  'constraintsNotEnforced',
-  'constraintsNotValidated',
-  'skipDbConstraints',
+  'constraintsAsAlter',
+  'integrityNotEnforced',
+  'integrityNotValidated',
+  'assertIntegrity',
+  'assertIntegrityType',
   'noRecompile',
   'internalMsg',
   'disableHanaComments',      // in case of issues with hana comment rendering
@@ -109,6 +113,10 @@ function translateOptions(input = {}, defaults = {}, hardRequire = {},
     mapToOldNames(optionName, optionValue);
   }
 
+  // Convenience for $user -> $user.id replacement
+  if (options.variableReplacements && options.variableReplacements.$user && typeof options.variableReplacements.$user === 'string')
+    options.variableReplacements.$user = { id: options.variableReplacements.$user };
+
   /**
    * Map a new-style option to it's old format
    *
@@ -130,6 +138,7 @@ function translateOptions(input = {}, defaults = {}, hardRequire = {},
       case 'sqlMapping':
         options.names = optionValue;
         break;
+      // No need to remap variableReplacements here - we use the new mechanism with that directly
       case 'magicVars':
         if (optionValue.user)
           options.user = optionValue.user;
@@ -149,7 +158,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' ], 'to.sql');
+      const processed = translateOptions(options, defaultOptions, hardOptions, undefined, [ 'sql-dialect-and-naming', 'constraints-as-alter-sqlite' ], 'to.sql');
 
       const result = Object.assign({}, processed);
       result.toSql = Object.assign({}, processed);
@@ -157,7 +166,7 @@ module.exports = {
       return result;
     },
     hdi: (options) => {
-      const hardOptions = { src: 'hdi' };
+      const hardOptions = { src: 'hdi', constraintsAsAlter: false };
       const defaultOptions = { sqlMapping: 'plain', sqlDialect: 'hana' };
       const processed = translateOptions(options, defaultOptions, hardOptions, { sqlDialect: generateStringValidator([ 'hana' ]) }, undefined, 'to.hdi');
 

package/lib/api/validate.js

@@ -25,13 +25,14 @@ const booleanValidator = {
 /**
  * Generate a Validator that validates that the
  * input is a string and one of the available options.
+ * The validation of the option values is case-insensitive.
  *
  * @param {any} availableValues Available values
  * @returns {Validator} Return a validator for a string in an expected range
  */
 function generateStringValidator(availableValues) {
   return {
-    validate: val => typeof val === 'string' && availableValues.indexOf(val) !== -1,
+    validate: val => typeof val === 'string' && availableValues.some( av => av.toLowerCase() === val.toLowerCase() ),
     expected: (val) => {
       return typeof val !== 'string' ? 'type string' : availableValues.join(', ');
     },
@@ -70,6 +71,14 @@ const validators = {
       return val === null ? val : `type ${ typeof val }`;
     },
   },
+  // TODO: Maybe do a deep validation of the whole object with leafs?
+  variableReplacements: {
+    validate: val => val !== null && typeof val === 'object' && !Array.isArray(val),
+    expected: () => 'type object',
+    found: (val) => {
+      return val === null ? val : `type ${ typeof val }`;
+    },
+  },
   messages: {
     validate: val => Array.isArray(val),
     expected: () => 'type array',
@@ -89,10 +98,17 @@ const validators = {
     expected: () => 'type array of string',
     found: val => `type ${ typeof val }`,
   },
+  defaultBinaryLength: {
+    validate: val => !Number.isNaN(Number(val)) && Number.isInteger(Number.parseFloat(val)),
+
+    expected: () => 'Integer literal',
+    found: val => `${ (!Number.isNaN(Number(val)) ? val : 'Not a Number') }`,
+  },
   defaultStringLength: {
-    validate: val => Number.isInteger(val),
+    validate: val => !Number.isNaN(Number(val)) && Number.isInteger(Number.parseFloat(val)),
+
     expected: () => 'Integer literal',
-    found: val => `type ${ typeof val }`,
+    found: val => `${ (!Number.isNaN(Number(val)) ? val : 'Not a Number') }`,
   },
   csnFlavor: {
     validate: val => typeof val === 'string',
@@ -102,6 +118,12 @@ const validators = {
   dictionaryPrototype: {
     validate: () => true,
   },
+  assertIntegrity: {
+    validate: val => typeof val === 'string' && val === 'individual' || typeof val === 'boolean',
+    expected: () => 'a boolean or a string with value \'individual\'',
+    found: val => (typeof val === 'string' ? val : `type ${ typeof val }`),
+  },
+  assertIntegrityType: generateStringValidator([ 'DB', 'RT' ]),
 };
 
 const allCombinationValidators = {
@@ -120,6 +142,11 @@ 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 */
 /**