@sap/cds-compiler 5.9.2 → 6.0.10

package/lib/render/utils/common.js

@@ -37,7 +37,7 @@ function renderFunc( funcName, node, renderArgs, utils ) {
   const { sqlDialect } = options;
   if (funcWithoutParen( node, sqlDialect ))
     return funcName;
-  const rewriteStandardFunctions = options.transformation !== 'hdbcds' && sqlDialect !== 'plain' && options.standardDatabaseFunctions;
+  const rewriteStandardFunctions = options.transformation !== 'hdbcds' && sqlDialect !== 'plain' && options.standardDatabaseFunctions !== false;
   if (rewriteStandardFunctions) {
     // we check function arguments for correctness
     const { error } = messageFunctions;
@@ -47,7 +47,7 @@ function renderFunc( funcName, node, renderArgs, utils ) {
     else if (standardDatabaseFunctions.common[funcName])
       return standardDatabaseFunctions.common[funcName].call(that, node);
   }
-  return `${funcName}(${renderArgs( node )})`;
+  return `${ funcName }(${ renderArgs( node ) })`;
 }
 
 /**
@@ -214,7 +214,7 @@ function getIntermediateContextNames( csn, parentName, artifactName ) {
  */
 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);
+  const possibleNames = Object.keys(csn.definitions).filter(name => name.startsWith(`${ artifactName }.`)).sort((a, b) => a.length - b.length);
   for (const name of possibleNames) {
     const artifact = csn.definitions[name];
     if (!artifact.$ignore && !hasValidSkipOrExists(artifact))
@@ -223,7 +223,7 @@ function addMissingChildContexts( csn, artifactName, killList ) {
 
   function addPossibleGaps( possibleGaps, gapArtifactName ) {
     for (const gap of possibleGaps) {
-      gapArtifactName += `.${gap}`;
+      gapArtifactName += `.${ gap }`;
       if (!csn.definitions[gapArtifactName]) {
         const contextName = gapArtifactName;
         csn.definitions[contextName] = {
@@ -378,7 +378,12 @@ const variablesToSql = {
     '$at.to': "TO_TIMESTAMP(SESSION_CONTEXT('VALID-TO'))",
     '$valid.from': "TO_TIMESTAMP(SESSION_CONTEXT('VALID-FROM'))",
     '$valid.to': "TO_TIMESTAMP(SESSION_CONTEXT('VALID-TO'))",
-    $now: 'CURRENT_TIMESTAMP',
+    $now: "TO_TIMESTAMP(SESSION_CONTEXT('NOW'))",
+    // special handling, see variableForDialect()
+    '$now.deprecated': 'CURRENT_TIMESTAMP',
+    // special handling, see variableForDialect()
+    // in DEFAULT, we can't render SESSION_CONTEXT
+    '$now.default': 'CURRENT_TIMESTAMP',
   },
   postgres: {
     '$user.id': "current_setting('cap.applicationuser')",
@@ -388,7 +393,9 @@ const variablesToSql = {
     '$at.to': "current_setting('cap.valid_to')::timestamp",
     '$valid.from': "current_setting('cap.valid_from')::timestamp",
     '$valid.to': "current_setting('cap.valid_to')::timestamp",
-    $now: 'current_timestamp',
+    $now: "current_setting('cap.now')::timestamp",
+    '$now.deprecated': 'current_timestamp',
+    '$now.default': 'current_timestamp',
   },
   sqlite: {
     '$user.id': "session_context( '$user.id' )",
@@ -398,7 +405,9 @@ const variablesToSql = {
     '$at.to': "session_context( '$valid.to' )",
     '$valid.from': "session_context( '$valid.from' )",
     '$valid.to': "session_context( '$valid.to' )",
-    $now: 'CURRENT_TIMESTAMP',
+    $now: "session_context( '$now' )",
+    '$now.deprecated': 'CURRENT_TIMESTAMP',
+    '$now.default': 'CURRENT_TIMESTAMP',
   },
   'old-sqlite': {
     // For sqlite, we render the string-format-time (strftime) function.
@@ -420,7 +429,9 @@ const variablesToSql = {
     '$at.to': "session_context( '$valid.to' )",
     '$valid.from': "session_context( '$valid.from' )",
     '$valid.to': "session_context( '$valid.to' )",
-    $now: 'CURRENT_TIMESTAMP',
+    $now: "session_context( '$now' )",
+    '$now.deprecated': 'CURRENT_TIMESTAMP',
+    '$now.default': 'CURRENT_TIMESTAMP',
   },
   h2: {
     '$user.id': '@applicationuser',
@@ -430,7 +441,9 @@ const variablesToSql = {
     '$at.to': '@valid_to',
     '$valid.from': '@valid_from',
     '$valid.to': '@valid_to',
-    $now: 'current_timestamp',
+    $now: '@now',
+    '$now.deprecated': 'current_timestamp',
+    '$now.default': 'current_timestamp',
   },
 };
 
@@ -439,15 +452,29 @@ const variablesToSql = {
  * Note that this function does not handle `variableReplacements`.  Callers should
  * first check if the user has specified them and use them instead.
  *
- * @param {SqlOptions} options Used for `sqlDialect` and better-sqlite option.
- * @param {string} variable Variable to render, e.g. `$user.id`.
- * @return {string|null} `null` if the variable could not be found for the given dialect and in the fallback values.
+ * @param {SqlOptions} options
+ *    Used for `sqlDialect` and better-sqlite option.
+ * @param {string} variable
+ *    Variable to render, e.g. `$user.id`.
+ * @param {null|'default'} [context = null]
+ *    A context in which the variable is used.  Some variables are translated
+ *    context-dependent, such as '$now'.
+ *
+ * @return {string|null}
+ *    `null` if the variable could not be found for the given dialect and in the fallback values.
  */
-function variableForDialect( options, variable ) {
+function variableForDialect( options, variable, context = null ) {
   const dialect = options.sqlDialect === 'sqlite' && options.betterSqliteSessionVariables === false
     ? 'old-sqlite'
     : options.sqlDialect;
-  return variablesToSql[dialect]?.[variable] || variablesToSql.fallback[variable] || null;
+
+  if (options.dollarNowAsTimestamp === true && variable === '$now')
+    return variablesToSql.hana['$now.deprecated'] ?? variablesToSql.hana.$now;
+
+  return variablesToSql[dialect]?.[`${ variable }.${ context }`] ||
+    variablesToSql[dialect]?.[variable] ||
+    variablesToSql.fallback[variable] ||
+    null;
 }
 
 /**
@@ -546,8 +573,8 @@ function getHanaComment( obj ) {
  * @returns {object} object with .front and .back
  */
 function getSqlSnippets( options, obj ) {
-  const front = obj['@sql.prepend'] ? `${obj['@sql.prepend']} ` : '';
-  const back = obj['@sql.append'] ? ` ${obj['@sql.append']}` : '';
+  const front = obj['@sql.prepend'] ? `${ obj['@sql.prepend'] } ` : '';
+  const back = obj['@sql.append'] ? ` ${ obj['@sql.append'] }` : '';
 
   return { front, back };
 }
@@ -571,7 +598,6 @@ function getSqlSnippets( options, obj ) {
  * @property {renderPart} val
  * @property {renderPart} enum
  * @property {renderPart} ref
- * @property {renderPart} aliasOnly
  * @property {renderPart} windowFunction
  * @property {renderPart} func
  * @property {renderPart} xpr
@@ -591,7 +617,6 @@ function getSqlSnippets( options, obj ) {
  * @property {renderPart} val
  * @property {renderPart} enum
  * @property {renderPart} ref
- * @property {renderPart} aliasOnly
  * @property {renderPart} windowFunction
  * @property {renderPart} func
  * @property {renderPart} xpr
@@ -688,12 +713,12 @@ function visitExpr( x ) {
   }
   else if (x.list) {
     // Render as non-nested expr.
-    return `(${x.list.map((item, i) => {
+    return `(${ x.list.map((item, i) => {
       this.env.path.push('list', i);
       const result = this.renderExpr(item, this.env);
       this.env.path.length -= 2;
       return result;
-    }).join(', ')})`;
+    }).join(', ') })`;
   }
   else if (x['#']) {
     // Enum symbol
@@ -722,10 +747,10 @@ function visitExpr( x ) {
     return this.SET(x);
   }
   else if (x.as) {
-    return this.aliasOnly(x);
+    return '';
   }
 
-  throw new ModelError(`renderExpr(): Unknown expression: ${JSON.stringify(x)}`);
+  throw new ModelError(`renderExpr(): Unknown expression: ${ JSON.stringify(x) }`);
 }
 
 module.exports = {

package/lib/render/utils/delta.js

@@ -13,7 +13,7 @@ class DeltaRenderer {
    * Render column additions as SQL. Checks for duplicate elements.
    */
   addColumnsFromElementStrings(artifactName, eltStrings) {
-    return eltStrings.map(eltString => `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ADD ${eltString};`);
+    return eltStrings.map(eltString => `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ADD ${ eltString };`);
   }
 
   /**
@@ -44,14 +44,14 @@ class DeltaRenderer {
    * Render key addition as SQL.
    */
   addKey(artifactName, elementsObj) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ADD ${this.primaryKey(elementsObj)};` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ADD ${ this.primaryKey(elementsObj) };` ];
   }
 
   /**
    * Render column removals as SQL.
    */
   dropColumns(artifactName, sqlIds) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} DROP ${sqlIds.join(', ')};` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } DROP ${ sqlIds.join(', ') };` ];
   }
 
   /**
@@ -65,7 +65,7 @@ class DeltaRenderer {
    * Render primary-key removals as SQL.
    */
   dropKey(artifactName) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} DROP PRIMARY KEY;` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } DROP PRIMARY KEY;` ];
   }
 
   /**
@@ -73,13 +73,13 @@ class DeltaRenderer {
    */
   alterColumns(artifactName, columnName, delta, definitionsStr, _eltName, _env) {
     if (Array.isArray(definitionsStr)) {
-      const prefix = `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER (`;
+      const prefix = `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER (`;
       const padding = ' '.repeat(prefix.length);
       const body = definitionsStr.map(s => padding + s).join(',\n').slice(padding.length); // no padding for first part
       const postfix = ');';
       return [ prefix + body + postfix ];
     }
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER (${definitionsStr});` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER (${ definitionsStr });` ];
   }
 
   /**
@@ -90,21 +90,21 @@ class DeltaRenderer {
       .filter(name => elementsObj[name].key && !elementsObj[name].virtual)
       .map(name => this.scopedFunctions.quoteSqlId(name))
       .join(', ');
-    return primaryKeys && `PRIMARY KEY(${primaryKeys})`;
+    return primaryKeys && `PRIMARY KEY(${ primaryKeys })`;
   }
 
   /**
    * Render entity-comment modifications as SQL.
    */
   alterEntityComment(artifactName, comment) {
-    return [ `COMMENT ON TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} IS ${this.comment(comment)};` ];
+    return [ `COMMENT ON TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } IS ${ this.comment(comment) };` ];
   }
 
   /**
    * Render column-comment modifications as SQL.
    */
   alterColumnComment(artifactName, columnName, comment) {
-    return [ `COMMENT ON COLUMN ${this.scopedFunctions.renderArtifactName(artifactName)}.${columnName} IS ${this.comment(comment)};` ];
+    return [ `COMMENT ON COLUMN ${ this.scopedFunctions.renderArtifactName(artifactName) }.${ columnName } IS ${ this.comment(comment) };` ];
   }
 
   /**
@@ -118,7 +118,7 @@ class DeltaRenderer {
    * Alter SQL snippet for entity.
    */
   alterEntitySqlSnippet(artifactName, snippet) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ${snippet};` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ${ snippet };` ];
   }
 
   /**
@@ -147,7 +147,7 @@ class DeltaRendererHana extends DeltaRenderer {
    */
   alterColumns(artifactName, columnName, delta, definitionsStr, _eltName, _env) {
     if (delta.details)
-      this.#details.push(`-- [WARNING] this statement could ${delta.lossy ? 'be lossy' : 'fail'}: ${delta.details}`);
+      this.#details.push(`-- [WARNING] this statement could ${ delta.lossy ? 'be lossy' : 'fail' }: ${ delta.details }`);
 
     this.#alters.push(definitionsStr);
     return [];
@@ -157,7 +157,7 @@ class DeltaRendererHana extends DeltaRenderer {
    * Render column additions as HANA SQL. Checks for duplicate elements.
    */
   addColumnsFromElementStrings(artifactName, eltStrings) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ADD (${eltStrings.join(', ')});` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ADD (${ eltStrings.join(', ') });` ];
   }
 
   /**
@@ -168,21 +168,21 @@ class DeltaRendererHana extends DeltaRenderer {
     return Object.entries(elementsObj)
       .map(([ name, elt ]) => this.scopedFunctions.renderAssociationElement(name, elt, env))
       .filter(s => s !== '')
-      .map(eltStr => `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ADD ASSOCIATION (${eltStr});`);
+      .map(eltStr => `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ADD ASSOCIATION (${ eltStr });`);
   }
 
   /**
    * Render column removals as HANA SQL.
    */
   dropColumns(artifactName, sqlIds) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} DROP (${sqlIds.join(', ')});` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } DROP (${ sqlIds.join(', ') });` ];
   }
 
   /**
    * Render association removals as HANA SQL.
    */
   dropAssociation(artifactName, sqlId) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} DROP ASSOCIATION ${sqlId};` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } DROP ASSOCIATION ${ sqlId };` ];
   }
 }
 
@@ -193,15 +193,15 @@ class DeltaRendererPostgres extends DeltaRenderer {
    */
   dropKey(artifactName) {
     const table = this.scopedFunctions.renderArtifactName(artifactName);
-    const pkey = this.scopedFunctions.renderArtifactName(`${artifactName}_pkey`);
-    return [ `ALTER TABLE ${table} DROP CONSTRAINT ${pkey};` ];
+    const pkey = this.scopedFunctions.renderArtifactName(`${ artifactName }_pkey`);
+    return [ `ALTER TABLE ${ table } DROP CONSTRAINT ${ pkey };` ];
   }
 
   /**
    * Render column removals as SQL.
    */
   dropColumns(artifactName, sqlIds) {
-    return sqlIds.map(sqlId => `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} DROP ${sqlId};`);
+    return sqlIds.map(sqlId => `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } DROP ${ sqlId };`);
   }
 
   /**
@@ -213,24 +213,24 @@ class DeltaRendererPostgres extends DeltaRenderer {
     definitionsStr = this.#removeNullabilityFromElementString(delta, definitionsStr);
 
     if (delta.old.default && !delta.old.value) // Drop old default if any exists
-      sqls.push(`ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER COLUMN ${columnName} DROP DEFAULT;`);
+      sqls.push(`ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER COLUMN ${ columnName } DROP DEFAULT;`);
 
     if (delta.new.default && !delta.new.value ) { // Alter column with default
       const df = delta.new.default;
       delete delta.new.default;
       const eltStrNoDefault = this.#removeNullabilityFromElementString(delta, this.scopedFunctions.renderElement(eltName, delta.new, null, null, env));
       delta.new.default = df;
-      sqls.push(`ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER ${eltStrNoDefault};`);
-      sqls.push(`ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER COLUMN ${columnName} SET DEFAULT ${this.scopedFunctions.renderExpr(delta.new.default, env.withSubPath('default'))};`);
+      sqls.push(`ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER ${ eltStrNoDefault };`);
+      sqls.push(`ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER COLUMN ${ columnName } SET DEFAULT ${ this.scopedFunctions.renderExpr(delta.new.default, env.withSubPath('default')) };`);
     }
     else { // Alter column without default
-      sqls.push(`ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER ${definitionsStr};`);
+      sqls.push(`ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER ${ definitionsStr };`);
     }
 
     if (delta.new.notNull && !delta.old.notNull)
-      sqls.push(`ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER ${columnName} SET NOT NULL;`);
+      sqls.push(`ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER ${ columnName } SET NOT NULL;`);
     else if (delta.old.notNull && !delta.new.notNull)
-      sqls.push(`ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER ${columnName} DROP NOT NULL;`);
+      sqls.push(`ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER ${ columnName } DROP NOT NULL;`);
 
     return sqls;
   }
@@ -261,7 +261,7 @@ class DeltaRendererH2 extends DeltaRenderer {
    * Render column modifications as H2 SQL - no ().
    */
   alterColumns(artifactName, columnName, delta, definitionsStr, _eltName, _env) {
-    return [ `ALTER TABLE ${this.scopedFunctions.renderArtifactName(artifactName)} ALTER ${definitionsStr};` ];
+    return [ `ALTER TABLE ${ this.scopedFunctions.renderArtifactName(artifactName) } ALTER ${ definitionsStr };` ];
   }
 }
 

package/lib/render/utils/operators.js

@@ -116,8 +116,8 @@ function transformExprOperators( xpr, options, messageFunctions, env ) {
   const sqlDialect = options.sqlDialect || 'plain';
   const operators = Object.assign(Object.create(null), operatorsPerDialect[sqlDialect] || operatorsPerDialect.plain);
 
-  if (!options.booleanEquality) {
-    // don't translate `!=` if the option isn't set; default to be changed in v6
+  if (options.booleanEquality === false) {
+    // don't translate `!=` if the option is set to false (for backward compatibility with v5)
     delete operators['!='];
   }
 

package/lib/render/utils/pretty.js

@@ -44,7 +44,7 @@ class Line extends Doc {
     this._indent = n;
   }
   toString() {
-    return `\n${' '.repeat(this._indent)}`;
+    return `\n${ ' '.repeat(this._indent) }`;
   }
 }
 
@@ -127,7 +127,7 @@ function flatten( doc ) {
     return doc.x;
   else if (typeof doc === 'string')
     return doc;
-  throw new Error(`unhandled case: ${typeof doc}`);
+  throw new Error(`unhandled case: ${ typeof doc }`);
 }
 
 /**
@@ -152,7 +152,7 @@ function nestBy( n, doc ) {
     return String(doc); // nesting absorbed by string
   }
 
-  throw new Error(`unhandled case: ${typeof doc}`);
+  throw new Error(`unhandled case: ${ typeof doc }`);
 }
 
 /**
@@ -243,7 +243,7 @@ function be( width, k, i, doc ) {
     }
     return result;
   }
-  throw new Error(`unhandled case: ${typeof doc}`);
+  throw new Error(`unhandled case: ${ typeof doc }`);
 }
 
 /**
@@ -288,7 +288,7 @@ function layout( doc ) {
     return doc.toString();
   else if (typeof doc === 'string')
     return doc;
-  throw new Error(`unhandled case: ${typeof doc}`);
+  throw new Error(`unhandled case: ${ typeof doc }`);
 }
 
 /**

package/lib/render/utils/sql.js

@@ -33,32 +33,32 @@ function renderReferentialConstraint( constraint, indent, toUpperCase, csn, opti
 
   const { sqlMapping, sqlDialect } = options;
   let result = '';
-  result += `${indent}CONSTRAINT ${quoteId(constraint.identifier)}\n`;
+  result += `${ indent }CONSTRAINT ${ quoteId(constraint.identifier) }\n`;
   if (renderAsHdbconstraint)
-    result += `${indent}ON ${quoteId(getResultingName(csn, sqlMapping, constraint.dependentTable))}\n`;
+    result += `${ indent }ON ${ quoteId(getResultingName(csn, sqlMapping, constraint.dependentTable)) }\n`;
   if (!alterConstraint) {
-    result += `${indent}FOREIGN KEY(${constraint.foreignKey.map(quoteId).join(', ')})\n`;
-    result += `${indent}REFERENCES ${quoteId(getResultingName(csn, sqlMapping, constraint.parentTable))}(${constraint.parentKey.map(quoteId).join(', ')})\n`;
-    const onDeleteRemark = constraint.onDeleteRemark ? ` -- ${constraint.onDeleteRemark}` : '';
+    result += `${ indent }FOREIGN KEY(${ constraint.foreignKey.map(quoteId).join(', ') })\n`;
+    result += `${ indent }REFERENCES ${ quoteId(getResultingName(csn, sqlMapping, constraint.parentTable)) }(${ constraint.parentKey.map(quoteId).join(', ') })\n`;
+    const onDeleteRemark = constraint.onDeleteRemark ? ` -- ${ constraint.onDeleteRemark }` : '';
 
     // omit 'RESTRICT' action for ON UPDATE / ON DELETE, because it interferes with deferred constraint check
     if (sqlDialect === 'sqlite' || sqlDialect === 'postgres') {
       if (constraint.onDelete === 'CASCADE' )
-        result += `${indent}ON DELETE ${constraint.onDelete}${onDeleteRemark}\n`;
+        result += `${ indent }ON DELETE ${ constraint.onDelete }${ onDeleteRemark }\n`;
     }
     else {
-      result += `${indent}ON UPDATE RESTRICT\n`;
-      result += `${indent}ON DELETE ${constraint.onDelete}${onDeleteRemark}\n`;
+      result += `${ indent }ON UPDATE RESTRICT\n`;
+      result += `${ indent }ON DELETE ${ constraint.onDelete }${ onDeleteRemark }\n`;
     }
   }
   // constraint enforcement / validation must be switched off using sqlite pragma statement
   // constraint enforcement / validation not supported by postgres
   if (options.transformation === 'hdbcds' || (options.toSql && sqlDialect !== 'sqlite' && sqlDialect !== 'postgres')) {
-    result += `${indent}${!constraint.validated ? 'NOT ' : ''}VALIDATED\n`;
-    result += `${indent}${!constraint.enforced ? 'NOT ' : ''}ENFORCED\n`;
+    result += `${ indent }${ !constraint.validated ? 'NOT ' : '' }VALIDATED\n`;
+    result += `${ indent }${ !constraint.enforced ? 'NOT ' : '' }ENFORCED\n`;
   }
   // for sqlite and postgreSQL, the DEFERRABLE keyword is required
-  result += `${indent}${sqlDialect === 'sqlite' || sqlDialect === 'postgres' ? 'DEFERRABLE ' : ''}INITIALLY DEFERRED`;
+  result += `${ indent }${ sqlDialect === 'sqlite' || sqlDialect === 'postgres' ? 'DEFERRABLE ' : '' }INITIALLY DEFERRED`;
   return result;
 }
 
@@ -110,7 +110,7 @@ function getIdentifierUtils( csn, options ) {
   function prepareIdentifier( name ) {
     // Sanity check
     if (options.sqlDialect === 'sqlite' && options.sqlMapping !== 'plain')
-      throw new ModelError(`Not expecting ${options.sqlMapping} names for 'sqlite' dialect`);
+      throw new ModelError(`Not expecting ${ options.sqlMapping } names for 'sqlite' dialect`);
 
 
     switch (options.sqlMapping) {
@@ -121,7 +121,7 @@ function getIdentifierUtils( csn, options ) {
       case 'hdbcds':
         return name;
       default:
-        throw new ModelError(`No matching rendering found for naming mode ${options.sqlMapping}`);
+        throw new ModelError(`No matching rendering found for naming mode ${ options.sqlMapping }`);
     }
   }