FE: changed string quoting

Author: Vitalii4as

forward_engineering/config.json

@@ -2,6 +2,7 @@
 	"type": "ddl",
 	"ddlType": "plugin",
 	"namePrefix": "PostgreSQL",
+	"mode": "pgsql",
 	"level": {
 		"container": true,
 		"entity": true,

forward_engineering/configs/templates.js

@@ -1,14 +1,14 @@
 module.exports = {
     createDatabase: 'CREATE DATABASE ${name}${template}${encoding}${locale}${collate}${characterClassification}${tablespace};\n',
 
-    createSchema: 'CREATE SCHEMA${ifNotExist} ${name};\nSET search_path TO ${name};\n${comment}\n',
+    createSchema: 'CREATE SCHEMA${ifNotExist} ${name};\nSET search_path TO ${name};\n\n${comment}\n',
 
     comment: 'COMMENT ON ${object} ${objectName} IS ${comment};\n',
 
     createTable:
         'CREATE${temporary} TABLE${ifNotExist} ${name} (\n' +
         '${columnDefinitions}${keyConstraints}${checkConstraints}${foreignKeyConstraints}\n' +
-        ')${options};\n${comment}${columnDescriptions}',
+        ')${options};\n\n${comment}${columnDescriptions}',
 
     columnDefinition: '${name} ${type}${collation}${primaryKey}${uniqueKey}${defaultValue}${notNull}',
 
@@ -26,7 +26,7 @@ module.exports = {
         ' ON${only} ${tableName}${using}${keys}${options};\n\n',
 
     createView:
-        'CREATE${orReplace}${temporary} VIEW ${name}${withOptions}\nAS ${selectStatement}${checkOption};\n${comment}\n',
+        'CREATE${orReplace}${temporary} VIEW ${name}${withOptions}\nAS ${selectStatement}${checkOption};\n\n${comment}\n',
 
     viewSelectStatement: 'SELECT ${keys}\n\tFROM ${tableName}',
 
@@ -43,8 +43,8 @@ module.exports = {
         '\tLANGUAGE ${language}\n' +
         'AS $BODY$\n${body}\n$BODY$;\n',
 
-    createCompositeType: 'CREATE TYPE ${name} AS (\n\t${columnDefinitions}\n);\n${comment}',
-    createEnumType: 'CREATE TYPE ${name} AS ENUM (${values});\n${comment}',
-    createRangeType: 'CREATE TYPE ${name} AS RANGE (\n\tSUBTYPE=${subtype}${options}\n);\n${comment}',
-    createDomainType: 'CREATE DOMAIN ${name} AS ${underlyingType}${notNull}${collate}${default}${constraints};\n${comment}'
+    createCompositeType: 'CREATE TYPE ${name} AS (\n\t${columnDefinitions}\n);\n\n${comment}',
+    createEnumType: 'CREATE TYPE ${name} AS ENUM (${values});\n\n${comment}',
+    createRangeType: 'CREATE TYPE ${name} AS RANGE (\n\tSUBTYPE=${subtype}${options}\n);\n\n${comment}',
+    createDomainType: 'CREATE DOMAIN ${name} AS ${underlyingType}${notNull}${collate}${default}${constraints};\n\n${comment}'
 };

forward_engineering/ddlProvider.js

@@ -82,7 +82,7 @@ module.exports = (baseProvider, options, app) => {
             assignTemplates,
             templates,
             commentIfDeactivated,
-            getNamePrefixedWithSchemaName,
+            wrapInQuotes,
             wrapComment,
         });
 

forward_engineering/helpers/columnDefinitionHelper.js

@@ -4,8 +4,8 @@ module.exports = ({
     assignTemplates,
     templates,
     commentIfDeactivated,
-    getNamePrefixedWithSchemaName,
     wrapComment,
+    wrapInQuotes
 }) => {
     const addLength = (type, length) => {
         return `${type}(${length})`;
@@ -60,12 +60,10 @@ module.exports = ({
     const isString = type => ['char', 'varchar', 'text', 'bit', 'varbit'].includes(type);
     const isDateTime = type => ['date', 'time', 'timestamp', 'interval'].includes(type);
 
-    const escapeQuotes = str => _.trim(str).replace(/(\')+/g, "'$1");
-
     const decorateDefault = (type, defaultValue) => {
         const constantsValues = ['current_timestamp', 'null'];
         if ((isString(type) || isDateTime(type)) && !constantsValues.includes(_.toLower(defaultValue))) {
-            return wrap(escapeQuotes(defaultValue), "'", "'");
+            return wrap(defaultValue, "$$", "$$");
         } else {
             return defaultValue;
         }
@@ -77,7 +75,7 @@ module.exports = ({
             .map(columnData => {
                 const comment = assignTemplates(templates.comment, {
                     object: 'COLUMN',
-                    objectName: getNamePrefixedWithSchemaName(columnData.name, tableName),
+                    objectName: `${tableName}.${wrapInQuotes(columnData.name)}`,
                     comment: wrapComment(columnData.comment),
                 });
 

forward_engineering/helpers/general.js

@@ -177,13 +177,7 @@ module.exports = ({ _, divideIntoActivatedAndDeactivated, commentIfDeactivated }
         );
     };
 
-    const wrapComment = comment => {
-        if (_.includes(comment, "'")) {
-            return `'${comment.replace("'", "''")}'`;
-        }
-
-        return `'${comment}'`;
-    };
+    const wrapComment = comment => `$$${comment}$$`;
 
     return {
         getFunctionArguments,