@sap/cds-compiler 2.15.8 → 3.1.0

package/lib/render/toHdbcds.js

@@ -35,6 +35,16 @@ function getEscapedHanaComment(obj) {
   return getHanaComment(obj).replace(/\n/g, '\\n').replace(/'/g, "''");
 }
 
+/**
+ * Render a string for HDBCDS, i.e. put it in quotes and escape single quotes.
+ *
+ * @param {string} str
+ * @returns {string}
+ */
+function renderStringForHdbcds(str) {
+  return `'${str.replace(/'/g, '\'\'')}'`;
+}
+
 /**
  * Render the CSN model 'model' to CDS source text. One source is created per
  * top-level artifact. Return a dictionary of top-level artifacts
@@ -731,7 +741,7 @@ function toHdbcdsSource(csn, options) {
 
     // Render 'null as <alias>' only for database and if element is virtual
     if (element && element.virtual) {
-      if (isDeprecatedEnabled(options, 'renderVirtualElements'))
+      if (isDeprecatedEnabled(options, '_renderVirtualElements'))
         return `${result}${env.indent}null as ${formatIdentifier(leaf)}`;
     }
     else {
@@ -829,7 +839,7 @@ function toHdbcdsSource(csn, options) {
    * @param {object} [elements] For leading query, the elements of the artifact
    * @returns {string} The rendered query
    */
-  function renderQuery(query, isLeadingQuery, env, path = [], elements) {
+  function renderQuery(query, isLeadingQuery, env, path = [], elements = null) {
     let result = '';
     env.skipKeys = !isLeadingQuery;
     // Set operator, like UNION, INTERSECT, ...
@@ -1223,7 +1233,7 @@ function toHdbcdsSource(csn, options) {
       case 'timestamp':
         return `${x.literal}'${x.val}'`;
       case 'string':
-        return `'${x.val.replace(/'/g, '\'\'')}'`;
+        return renderStringForHdbcds(x.val);
       case 'object':
         if (x.val === null)
           return 'null';
@@ -1260,22 +1270,16 @@ function toHdbcdsSource(csn, options) {
       const magicReplacement = getVariableReplacement(x.ref, options);
       if (x.ref[0] === '$user') {
         if (magicReplacement !== null)
-          return `'${magicReplacement}'`;
-
-        // Keep old way of solving this to remain backwards compatible
-        // FIXME: this is all not enough: we might need an explicit select item alias
-        if (x.ref[1] === 'id') {
-          if (options.magicVars && options.magicVars.user && (typeof options.magicVars.user === 'string' || options.magicVars.user instanceof String))
-            return `'${options.magicVars.user}'`;
+          return renderStringForHdbcds(magicReplacement);
 
-          else if ((options.magicVars && options.magicVars.user && options.magicVars.user.id) && (typeof options.magicVars.user.id === 'string' || options.magicVars.user.id instanceof String))
-            return `'${options.magicVars.user.id}'`;
+        // Note: The compiler already transforms $user into $user.id.
 
+        // FIXME: this is all not enough: we might need an explicit select item alias (?)
+        if (x.ref[1] === 'id')
           return 'SESSION_CONTEXT(\'APPLICATIONUSER\')';
-        }
-        else if (x.ref[1] === 'locale') {
+
+        else if (x.ref[1] === 'locale')
           return 'SESSION_CONTEXT(\'LOCALE\')';
-        }
       }
       else if (x.ref[0] === '$at') {
         if (x.ref[1] === 'from')
@@ -1285,7 +1289,7 @@ function toHdbcdsSource(csn, options) {
           return 'TO_TIMESTAMP(SESSION_CONTEXT(\'VALID-TO\'))';
       }
       else if (x.ref[0] === '$session' && magicReplacement !== null) {
-        return `'${magicReplacement}'`;
+        return renderStringForHdbcds(magicReplacement);
       }
     }
     return `${(x.param || x.global) ? ':' : ''}${x.ref.map((step, index) => renderPathStep(step, index, x.ref, env, this.inline)).join('.')}`;

package/lib/render/toRename.js

@@ -1,20 +1,24 @@
 
 'use strict';
 
-const { CompilationError, hasErrors } = require('../base/messages');
+const { makeMessageFunction } = require('../base/messages');
 const { checkCSNVersion } = require('../json/csnVersion');
-const { getUtils } = require('../model/csnUtils');
+const { getUtils, forEachDefinition } = require('../model/csnUtils');
+const { optionProcessor } = require('../optionProcessor');
+const { isBetaEnabled } = require('../base/model');
+const { transformForHanaWithCsn } = require('../transform/forHanaNew');
 
-// FIXME: This is not up-to-date in regards to the changes to hdbcds/sql quoting etc.
 
 /**
+ * FIXME: Not yet supported, only in beta mode
+ * FIXME: This is not up-to-date in regards to the changes to hdbcds/sql quoting etc.
  *
- * Render the augmented CSN 'model' to SQL DDL statements renaming existing tables and their
+ * Generate SQL DDL rename statements for a migration, renaming existing tables and their
  * columns so that they match the result of "toHana" or "toSql" with the 'plain' option for names.
  * Expects the naming convention of the existing tables to be either 'quoted' or 'hdbcds' (default).
- * The following options control what is actually generated:
+ * The following options control what is actually generated (see help above):
  *   options : {
- *     toRename.names      :  existing names, either 'quoted' or 'hdbcds' (default)
+ *     sqlMapping :  existing names, either 'quoted' or 'hdbcds' (default)
  *   }
  * Return a dictionary of top-level artifacts by their names, like this:
  * { "foo" : "RENAME TABLE \"foo\" ...",
@@ -22,34 +26,52 @@ const { getUtils } = require('../model/csnUtils');
  * }
  *
  * @todo clarify input parameters
- * @param {CSN.Model} csn Augmented csn?
+ * @param {CSN.Model} inputCsn CSN?
  * @param {CSN.Options} options Transformation options
  * @returns {object} A dictionary of name: rename statement
  */
-function toRenameDdl(csn, options) {
-  // Merge options (arguments first, then model options and default)
-  const result = Object.create(null);
+function toRename(inputCsn, options) {
+  const { error, warning, throwWithError } = makeMessageFunction(inputCsn, options, 'to.rename');
+
+  // Merge options with defaults.
+  options = Object.assign({ sqlMapping: 'hdbcds' }, options);
+
+  // Verify options
+  optionProcessor.verifyOptions(options, 'toRename').forEach(complaint => warning(null, null, `${complaint}`));
+  checkCSNVersion(inputCsn, options);
+
+  // Requires beta mode
+  if (!isBetaEnabled(options, 'toRename'))
+    error(null, null, 'Generation of SQL rename statements is not supported yet (only in beta mode)');
 
-  checkCSNVersion(csn, options);
+  // FIXME: Currently, 'toRename' implies transformation for HANA (transferring the options to forHana)
+  const csn = transformForHanaWithCsn(inputCsn, options, 'to.rename');
+  // forHanaCsn looses empty contexts and services, add them again so that toRename can calculate the namespaces
+  forEachDefinition(csn, (artifact, artifactName) => {
+    if ((artifact.kind === 'context' || artifact.kind === 'service') && csn.definitions[artifactName] === undefined)
+      csn.definitions[artifactName] = artifact;
+  });
+
+  const result = Object.create(null);
+  const { getNamespaceOfArtifact } = getUtils(csn, false);
 
-  const { getNamespaceOfArtifact } = getUtils(csn);
   // Render each artifact on its own
   for (const artifactName in csn.definitions) {
     const sourceStr = renameTableAndColumns(artifactName, csn.definitions[artifactName]);
-
     if (sourceStr !== '')
       result[artifactName] = sourceStr;
   }
-  // Throw exception in case of errors
-  if (hasErrors(options.messages))
-    throw new CompilationError(options.messages);
 
-  return result;
+  throwWithError();
 
+  return {
+    rename: result,
+    options,
+  };
 
   /**
    * If 'art' is a non-view entity, generate SQL statements to rename the corresponding
-   * table and its columns from the naming conventions given in 'options.toRename.name'
+   * table and its columns from the naming conventions given in 'options.sqlMapping'
    * (either 'quoted' or 'hdbcds') to 'plain'. In addition, drop any existing associations
    * from the columns (they would likely become invalid anyway).
    * Do not rename anything if the names are identical.
@@ -97,7 +119,7 @@ function toRenameDdl(csn, options) {
    * @returns {string} Absolute name
    */
   function absoluteCdsName(name) {
-    if (options.toRename.names !== 'hdbcds')
+    if (options.sqlMapping !== 'hdbcds')
       return name;
 
     const namespaceName = getNamespaceOfArtifact(name);
@@ -108,14 +130,14 @@ function toRenameDdl(csn, options) {
   }
 
   /**
-   * Return 'name' with appropriate "-quotes, also replacing '::' by '.' if 'options.toRename.names'
+   * Return 'name' with appropriate "-quotes, also replacing '::' by '.' if 'options.sqlMapping'
    * is 'quoted'
    *
    * @param {string} name Name to quote
    * @returns {string} Quoted string
    */
   function quoteSqlId(name) {
-    if (options.toRename.names === 'quoted')
+    if (options.sqlMapping === 'quoted')
       name = name.replace(/::/g, '.');
 
     return `"${name.replace(/"/g, '""')}"`;
@@ -134,5 +156,5 @@ function toRenameDdl(csn, options) {
 }
 
 module.exports = {
-  toRenameDdl,
+  toRename,
 };

package/lib/render/toSql.js

@@ -97,8 +97,8 @@ function toSqlDdl(csn, options) {
     aliasOnly(x, _env) {
       return x.as;
     },
-    windowFunction: (x, env) => renderWindowFunction(smartFuncId(prepareIdentifier(x.func), options.toSql.dialect), x, env),
-    func: (x, env) => renderFunc(smartFuncId(prepareIdentifier(x.func), options.toSql.dialect), x, options.toSql.dialect, a => renderArgs(a, '=>', env, null)),
+    windowFunction: (x, env) => renderWindowFunction(smartFuncId(prepareIdentifier(x.func), options.sqlDialect), x, env),
+    func: (x, env) => renderFunc(smartFuncId(prepareIdentifier(x.func), options.sqlDialect), x, options.sqlDialect, a => renderArgs(a, '=>', env, null)),
     xpr(x, env) {
       if (this.nestedExpr && !x.cast)
         return `(${renderExpr(x.xpr, env, this.inline, true)})`;
@@ -117,14 +117,18 @@ function toSqlDdl(csn, options) {
      */
     addColumns: {
       fromElementStrings(tableName, eltStrings) {
+        if (options.sqlDialect === 'sqlite') // SQLite can only alter one column at a time
+          return eltStrings.map(eltString => `ALTER TABLE ${tableName} ADD ${eltString};`);
+
         const elts = options.sqlDialect === 'hana' ? `(${eltStrings.join(', ')})` : `${eltStrings.join(', ')}`;
         return [ `ALTER TABLE ${tableName} ADD ${elts};` ];
       },
       fromElementsObj(artifactName, tableName, elementsObj, env, duplicateChecker) {
         // Only extend with 'ADD' for elements/associations
         // TODO: May also include 'RENAME' at a later stage
+        const alterEnv = activateAlterMode(env);
         const elements = Object.entries(elementsObj)
-          .map(([ name, elt ]) => renderElement(artifactName, name, elt, duplicateChecker, null, env))
+          .map(([ name, elt ]) => renderElement(artifactName, name, elt, duplicateChecker, null, alterEnv))
           .filter(s => s !== '');
 
         if (elements.length)
@@ -138,10 +142,10 @@ function toSqlDdl(csn, options) {
       TODO duplicity check
      */
     addAssociations(artifactName, tableName, elementsObj, env) {
-      return Object.entries(elementsObj)
+      return options.sqlDialect === 'hana' ? Object.entries(elementsObj)
         .map(([ name, elt ]) => renderAssociationElement(name, elt, env))
         .filter(s => s !== '')
-        .map(eltStr => `ALTER TABLE ${tableName} ADD ASSOCIATION (${eltStr});`);
+        .map(eltStr => `ALTER TABLE ${tableName} ADD ASSOCIATION (${eltStr});`) : [];
     },
     /*
       Render key addition as HANA SQL.
@@ -159,7 +163,7 @@ function toSqlDdl(csn, options) {
       Render association removals as HANA SQL.
      */
     dropAssociation(tableName, sqlId) {
-      return [ `ALTER TABLE ${tableName} DROP ASSOCIATION ${sqlId};` ];
+      return options.sqlDialect === 'hana' ? [ `ALTER TABLE ${tableName} DROP ASSOCIATION ${sqlId};` ] : [];
     },
     /*
       Render primary-key removals as HANA SQL.
@@ -238,7 +242,7 @@ function toSqlDdl(csn, options) {
   };
 
   // Registries for artifact and element names per CSN section
-  const definitionsDuplicateChecker = new DuplicateChecker(options.toSql.names);
+  const definitionsDuplicateChecker = new DuplicateChecker(options.sqlMapping);
   const deletionsDuplicateChecker = new DuplicateChecker();
   const extensionsDuplicateChecker = new DuplicateChecker();
   const removeElementsDuplicateChecker = new DuplicateChecker();
@@ -262,7 +266,7 @@ function toSqlDdl(csn, options) {
   // Render each artifact extension
   // Only HANA SQL is currently supported.
   // Note that extensions may contain new elements referenced in migrations, thus should be compiled first.
-  if (csn.extensions && (options.toSql.dialect === 'hana' || isBetaEnabled(options, 'sqlExtensions'))) {
+  if (csn.extensions && (options.sqlDialect === 'hana' || isBetaEnabled(options, 'sqlExtensions'))) {
     for (const extension of options && options.testMode ? sortCsn(csn.extensions) : csn.extensions) {
       if (extension.extend) {
         const artifactName = extension.extend;
@@ -275,7 +279,7 @@ function toSqlDdl(csn, options) {
 
   // Render each artifact change
   // Only HANA SQL is currently supported.
-  if (csn.migrations && (options.toSql.dialect === 'hana' || isBetaEnabled(options, 'sqlExtensions'))) {
+  if (csn.migrations && (options.sqlDialect === 'hana' || isBetaEnabled(options, 'sqlExtensions'))) {
     for (const migration of options && options.testMode ? sortCsn(csn.migrations) : csn.migrations) {
       if (migration.migrate) {
         const artifactName = migration.migrate;
@@ -294,7 +298,7 @@ function toSqlDdl(csn, options) {
   // Throw exception in case of errors
   throwWithAnyError();
 
-  // Transfer results from hdb-specific dictionaries into 'sql' dictionary in proper order if toSql.src === 'sql'
+  // Transfer results from hdb-specific dictionaries into 'sql' dictionary in proper order if src === 'sql'
   // (relying on the order of dictionaries above)
   // FIXME: Should consider inter-view dependencies, too
   const sql = Object.create(null);
@@ -305,10 +309,10 @@ function toSqlDdl(csn, options) {
   const { deletions, migrations: _, ...hdbKinds } = mainResultObj;
   for (const hdbKind of Object.keys(hdbKinds)) {
     for (const name in mainResultObj[hdbKind]) {
-      if (options.toSql.src === 'sql') {
+      if (options.src === 'sql') {
         let sourceString = mainResultObj[hdbKind][name];
         // Hack: Other than in 'hdbtable' files, in HANA SQL COLUMN is not mandatory but default.
-        if (options.toSql.dialect === 'hana' && hdbKind === 'hdbtable' && sourceString.startsWith('COLUMN '))
+        if (options.sqlDialect === 'hana' && hdbKind === 'hdbtable' && sourceString.startsWith('COLUMN '))
           sourceString = sourceString.slice('COLUMN '.length);
         sql[name] = `${options.testMode ? '' : sqlVersionLine}CREATE ${sourceString};`;
       }
@@ -316,7 +320,7 @@ function toSqlDdl(csn, options) {
         mainResultObj[hdbKind][name] = sqlVersionLine + mainResultObj[hdbKind][name];
       }
     }
-    if (options.toSql.src === 'sql')
+    if (options.src === 'sql')
       delete mainResultObj[hdbKind];
   }
 
@@ -329,7 +333,7 @@ function toSqlDdl(csn, options) {
     mainResultObj.sql = sql;
   }
 
-  if (options.toSql.src === 'sql')
+  if (options.src === 'sql')
     mainResultObj.sql = sql;
 
   for (const name in deletions)
@@ -420,7 +424,7 @@ function toSqlDdl(csn, options) {
    * @returns {string} Artifact name
    */
   function renderArtifactName(artifactName) {
-    return quoteSqlId(getResultingName(csn, options.toSql.names, artifactName));
+    return quoteSqlId(getResultingName(csn, options.sqlMapping, artifactName));
   }
 
   // Render an artifact migration into the appropriate dictionary of 'resultObj'.
@@ -434,7 +438,7 @@ function toSqlDdl(csn, options) {
     function getEltStr(defVariant, eltName) {
       return defVariant.target
         ? renderAssociationElement(eltName, defVariant, env)
-        : renderElement(artifactName, eltName, defVariant, null, null, env);
+        : renderElement(artifactName, eltName, defVariant, null, null, activateAlterMode(env));
     }
     function getEltStrNoProps(defVariant, eltName, ...props) {
       const defNoProps = Object.assign({}, defVariant);
@@ -573,7 +577,7 @@ function toSqlDdl(csn, options) {
     const { front, back } = getSqlSnippets(options, art);
     let result = front;
     // Only HANA has row/column tables
-    if (options.toSql.dialect === 'hana') {
+    if (options.sqlDialect === 'hana') {
       if (hanaTc && hanaTc.storeType) {
         // Explicitly specified
         result += `${art.technicalConfig.hana.storeType.toUpperCase()} `;
@@ -604,7 +608,7 @@ function toSqlDdl(csn, options) {
     // for `to.sql` w/ dialect `hana` the constraints will be part of the
     const constraintsAsAlter = !options.constraintsInCreateTable && options.src === 'sql' && options.sqlDialect === 'hana';
     if ( !constraintsAsAlter && art.$tableConstraints && art.$tableConstraints.referential) {
-      const renderReferentialConstraintsAsHdbconstraint = options.toSql.src === 'hdi';
+      const renderReferentialConstraintsAsHdbconstraint = options.src === 'hdi';
       const referentialConstraints = {};
       Object.entries(art.$tableConstraints.referential)
         .forEach(([ fileName, referentialConstraint ]) => {
@@ -627,7 +631,7 @@ function toSqlDdl(csn, options) {
     const uniqueConstraints = art.$tableConstraints && art.$tableConstraints.unique;
     for (const cn in uniqueConstraints) {
       const c = uniqueConstraints[cn];
-      if (options.toSql.src === 'hdi') {
+      if (options.src === 'hdi') {
         resultObj.hdbindex[`${artifactName}.${cn}`]
           = `UNIQUE INVERTED INDEX ${renderArtifactName(`${artifactName}_${cn}`)} ON ${tableName} (${c.map(cpath => quoteSqlId(cpath.ref[0])).join(', ')})`;
       }
@@ -637,20 +641,20 @@ function toSqlDdl(csn, options) {
     }
     result += `${env.indent}\n)`;
 
-    if (options.toSql.dialect === 'hana')
+    if (options.sqlDialect === 'hana')
       result += renderTechnicalConfiguration(art.technicalConfig, childEnv);
 
 
     const associations = Object.keys(art.elements).map(name => renderAssociationElement(name, art.elements[name], childEnv))
       .filter(s => s !== '')
       .join(',\n');
-    if (associations !== '' && options.toSql.dialect === 'hana') {
+    if (associations !== '' && options.sqlDialect === 'hana') {
       result += `${env.indent} WITH ASSOCIATIONS (\n${associations}\n`;
       result += `${env.indent})`;
     }
     // Only HANA has indices
     // FIXME: Really? We should provide a DB-agnostic way to specify that
-    if (options.toSql.dialect === 'hana')
+    if (options.sqlDialect === 'hana')
       renderIndexesInto(art.technicalConfig && art.technicalConfig.hana.indexes, artifactName, resultObj, env);
 
     if (options.sqlDialect === 'hana' && hasHanaComment(art, options))
@@ -753,12 +757,12 @@ function toSqlDdl(csn, options) {
       duplicateChecker.addElement(quotedElementName, elm.$location, elementName);
 
     let result = `${env.indent + quotedElementName} ${renderTypeReference(artifactName, elementName, elm)
-    }${renderNullability(elm, true)}`;
+    }${renderNullability(elm, true, env.alterMode)}`;
     if (elm.default)
       result += ` DEFAULT ${renderExpr(elm.default, env)}`;
 
     // Only HANA has fuzzy indices
-    if (fzindex && options.toSql.dialect === 'hana')
+    if (fzindex && options.sqlDialect === 'hana')
       result += ` ${renderExpr(fzindex, env)}`;
 
     // (table) elements can only have a @sql.append
@@ -906,7 +910,7 @@ function toSqlDdl(csn, options) {
         throw new ModelError(`Unexpected form of index: "${index}"`);
 
       let indexName = renderArtifactName(`${artifactName}.${index[i + 1].ref}`);
-      if (options.toSql.names === 'plain')
+      if (options.sqlMapping === 'plain')
         indexName = indexName.replace(/(\.|::)/g, '_');
 
       const result = index.slice(0, i + 1); // CREATE UNIQUE INDEX
@@ -945,7 +949,7 @@ function toSqlDdl(csn, options) {
       let result = `${renderViewSource(artifactName, source.args[0], env)}`;
       for (let i = 1; i < source.args.length; i++) {
         result = `(${result} ${source.join.toUpperCase()} `;
-        if (options.toSql.dialect === 'hana')
+        if (options.sqlDialect === 'hana')
           result += renderJoinCardinality(source.cardinality);
         result += `JOIN ${renderViewSource(artifactName, source.args[i], env)}`;
         if (source.on)
@@ -1008,7 +1012,7 @@ function toSqlDdl(csn, options) {
     let result = renderAbsolutePath(path, ':', env);
 
     // Take care of aliases
-    const implicitAlias = path.ref.length === 0 ? getLastPartOf(getResultingName(csn, options.toSql.names, path.ref[0])) : getLastPartOfRef(path.ref);
+    const implicitAlias = path.ref.length === 0 ? getLastPartOf(getResultingName(csn, options.sqlMapping, path.ref[0])) : getLastPartOfRef(path.ref);
     if (path.as) {
       // Source had an alias - render it
       result += ` AS ${quoteSqlId(path.as)}`;
@@ -1126,7 +1130,7 @@ function toSqlDdl(csn, options) {
     let result = '';
     const leaf = col.as || col.ref && col.ref[col.ref.length - 1] || col.func;
     if (leaf && elements[leaf] && elements[leaf].virtual) {
-      if (isDeprecatedEnabled(options, 'renderVirtualElements'))
+      if (isDeprecatedEnabled(options, '_renderVirtualElements'))
         // render a virtual column 'null as <alias>'
         result += `${env.indent}NULL AS ${quoteSqlId(col.as || leaf)}`;
     }
@@ -1165,7 +1169,7 @@ function toSqlDdl(csn, options) {
       .map(name => renderAssociationElement(name, art.elements[name], childEnv))
       .filter(s => s !== '')
       .join(',\n');
-    if (associations !== '' && options.toSql.dialect === 'hana') {
+    if (associations !== '' && options.sqlDialect === 'hana') {
       result += `${env.indent}\nWITH ASSOCIATIONS (\n${associations}\n`;
       result += `${env.indent})`;
     }
@@ -1197,7 +1201,7 @@ function toSqlDdl(csn, options) {
         // this would be an incompatible change, as non-uppercased, quoted identifiers
         // are rejected by the HANA compiler.
         let pIdentifier;
-        if (options.toSql.names === 'quoted' || options.toSql.names === 'hdbcds')
+        if (options.sqlMapping === 'quoted' || options.sqlMapping === 'hdbcds')
           pIdentifier = prepareIdentifier(pn);
         else
           pIdentifier = quoteSqlId(pn);
@@ -1386,7 +1390,7 @@ function toSqlDdl(csn, options) {
       'cds.LocalTime': 'cds.Time',
     };
     const tName = forHanaRenamesToEarly[typeName] || typeName;
-    const types = cdsToSqlTypes[options.toSql.dialect];
+    const types = cdsToSqlTypes[options.sqlDialect];
     return types && types[tName] || cdsToSqlTypes.standard[tName] || 'CHAR';
   }
 
@@ -1395,9 +1399,15 @@ function toSqlDdl(csn, options) {
    *
    * @param {object} obj Object to render for
    * @param {boolean} treatKeyAsNotNull Whether to render KEY as not null
+   * @param {boolean} deltaMode Look for a $notNull and use that with precedence over notNull
    * @returns {string} NULL/NOT NULL or ''
    */
-  function renderNullability(obj, treatKeyAsNotNull = false) {
+  function renderNullability(obj, treatKeyAsNotNull = false, deltaMode = false) {
+    if (deltaMode && obj.$notNull !== undefined) { // can be set via compare.js if it goes from "not null" to implicit "null"
+      return obj.$notNull ? ' NOT NULL' : ' NULL';
+    }
+
+
     if (obj.notNull === undefined && !(obj.key && treatKeyAsNotNull)) {
       // Attribute not set at all
       return '';
@@ -1426,7 +1436,7 @@ function toSqlDdl(csn, options) {
 
     if (elm.srid !== undefined) {
       // SAP HANA Geometry types translate into CHAR in plain/sqlite (give them the default length of 2000)
-      if (options.toSql.dialect !== 'hana')
+      if (options.sqlDialect !== 'hana')
         params.push(2000);
       else
         params.push(elm.srid);
@@ -1448,7 +1458,7 @@ function toSqlDdl(csn, options) {
       case 'date':
       case 'time':
       case 'timestamp':
-        if (options.toSql.dialect === 'sqlite') {
+        if (options.sqlDialect === 'sqlite') {
           // simple string literal '2017-11-02'
           return `'${x.val}'`;
         }
@@ -1474,7 +1484,7 @@ function toSqlDdl(csn, options) {
 
       if (x.ref[0] === '$user') {
         if (magicReplacement !== null)
-          return `'${magicReplacement}'`;
+          return renderStringForSql(magicReplacement, options.sqlDialect);
 
         const result = render$user();
         // Invalid second path step doesn't cause a return
@@ -1488,7 +1498,19 @@ function toSqlDdl(csn, options) {
           return result;
       }
       else if (x.ref[0] === '$session' && magicReplacement !== null) {
-        return `'${magicReplacement}'`;
+        return renderStringForSql(magicReplacement, options.sqlDialect);
+      }
+      else if (x.ref[0] === '$now') { // TODO: Can there be cases where $now is followed by something?
+        switch (options.sqlDialect) {
+          case 'plain':
+          case 'sqlite':
+          case 'hana':
+            return 'CURRENT_TIMESTAMP';
+          case 'postgres':
+            return 'current_timestamp';
+          default:
+            return quoteSqlId(x.ref[0]);
+        }
       }
     }
     // FIXME: We currently cannot distinguish whether '$parameters' was quoted or not - we
@@ -1508,29 +1530,19 @@ function toSqlDdl(csn, options) {
      * @returns {string|null} Null in case of an invalid second path step
      */
     function render$user() {
-      // FIXME: this is all not enough: we might need an explicit select item alias
+      // FIXME: this is all not enough: we might need an explicit select item alias (?)
       if (x.ref[1] === 'id') {
-        // Keep the old-style for compatibilty with magicVars.id - instead of magicVars.user.id...
-        if (options.toSql.user && typeof options.toSql.user === 'string' || options.toSql.user instanceof String)
-          return `'${options.toSql.user}'`;
-
-        else if ((options.toSql.user && options.toSql.user.id) && (typeof options.toSql.user.id === 'string' || options.toSql.user.id instanceof String))
-          return `'${options.toSql.user.id}'`;
-
-        if (options.toSql.dialect === 'sqlite' || options.toSql.dialect === 'plain') {
-          warning(null, null, 'The "$user" variable is not supported. Use option "variableReplacements" to specify a value for "$user.id"');
-          return '\'$user.id\'';
-        }
-        return 'SESSION_CONTEXT(\'APPLICATIONUSER\')';
+        if (options.sqlDialect === 'hana')
+          return 'SESSION_CONTEXT(\'APPLICATIONUSER\')';
+        warning(null, null, 'The "$user" variable is not supported. Use option "variableReplacements" to specify a value for "$user.id"');
+        return '\'$user.id\'';
       }
       else if (x.ref[1] === 'locale') {
-        if (options.toSql.dialect === 'sqlite' || options.toSql.dialect === 'plain') {
-          return (options.toSql.user && options.toSql.user.locale)
-            ? `'${options.toSql.user && options.toSql.user.locale}'` : '\'en\'';
-        }
-        return 'SESSION_CONTEXT(\'LOCALE\')';
+        if (options.sqlDialect === 'hana')
+          return 'SESSION_CONTEXT(\'LOCALE\')';
+        return '\'en\''; // default language
       }
-      // Basically: Second path step was invalid, do nothing - should not happen, see 'unknownMagic.js'
+      // Basically: Second path step was invalid, do nothing - should not happen.
       return null;
     }
     /**
@@ -1547,13 +1559,14 @@ function toSqlDdl(csn, options) {
       */
     function render$at() {
       if (x.ref[1] === 'from') {
-        switch (options.toSql.dialect) {
+        switch (options.sqlDialect) {
           case 'sqlite': {
             const dateFromFormat = '%Y-%m-%dT%H:%M:%S.000Z';
             return `strftime('${dateFromFormat}', 'now')`;
           }
           case 'hana':
             return 'TO_TIMESTAMP(SESSION_CONTEXT(\'VALID-FROM\'))';
+          case 'postgres':
           case 'plain':
             return 'current_timestamp';
           default:
@@ -1562,7 +1575,7 @@ function toSqlDdl(csn, options) {
       }
 
       if (x.ref[1] === 'to') {
-        switch (options.toSql.dialect) {
+        switch (options.sqlDialect) {
           case 'sqlite': {
             // + 1ms compared to $at.from
             const dateToFormat = '%Y-%m-%dT%H:%M:%S.001Z';
@@ -1570,6 +1583,7 @@ function toSqlDdl(csn, options) {
           }
           case 'hana':
             return 'TO_TIMESTAMP(SESSION_CONTEXT(\'VALID-TO\'))';
+          case 'postgres':
           case 'plain':
             return 'current_timestamp';
           default:
@@ -1591,7 +1605,6 @@ function toSqlDdl(csn, options) {
       if (typeof (s) === 'string') {
         // TODO: When is this actually executed and not handled already in renderExpr?
         const magicForHana = {
-          $now: 'CURRENT_TIMESTAMP',
           '$user.id': 'SESSION_CONTEXT(\'APPLICATIONUSER\')',
           '$user.locale': 'SESSION_CONTEXT(\'LOCALE\')',
         };
@@ -1599,7 +1612,7 @@ function toSqlDdl(csn, options) {
         if (idx === 0) {
           // HANA-specific translation of '$now' and '$user'
           // FIXME: this is all not enough: we might need an explicit select item alias
-          if (magicForHana[s])
+          if (options.sqlDialect === 'hana' && magicForHana[s])
             return magicForHana[s];
 
           // Ignore initial $projection and initial $self
@@ -1652,6 +1665,15 @@ function toSqlDdl(csn, options) {
   function increaseIndent(env) {
     return Object.assign({}, env, { indent: `${env.indent}  ` });
   }
+  /**
+   * Returns a copy of 'env' with alterMode set to true
+   *
+   * @param {object} env Render environment
+   * @returns {object} Render environment with alterMode
+   */
+  function activateAlterMode(env) {
+    return Object.assign({ alterMode: true }, env);
+  }
 }
 
 /**