fix conflict

Author: DrMyroslav

forward_engineering/configs/templates.js

@@ -20,12 +20,12 @@ module.exports = {
 
 	checkConstraint: '${name} CHECK (${expression})${noInherit}',
 
-	createForeignKeyConstraint: '${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})',
+	createForeignKeyConstraint: '${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})${match}${onDelete}${onUpdate}',
 
 	createKeyConstraint: '${constraintName}${keyType}${columns}${includeNonKey}${storageParameters}${tablespace}',
 
 	createForeignKey:
-		'ALTER TABLE IF EXISTS ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable}(${primaryKey});',
+		'ALTER TABLE IF EXISTS ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable}(${primaryKey})${match}${onDelete}${onUpdate};',
 
 	index:
 		'CREATE${unique} INDEX${concurrently}${ifNotExist} ${name}\n' +

forward_engineering/ddlProvider.js

@@ -32,6 +32,7 @@ module.exports = (baseProvider, options, app) => {
 		foreignActiveKeysToString,
 		createKeyConstraint,
 		getConstraintsWarnings,
+		additionalPropertiesForForeignKey,
 	} = require('./helpers/constraintsHelper')({
 		_,
 		commentIfDeactivated,
@@ -322,6 +323,7 @@ module.exports = (baseProvider, options, app) => {
 				foreignTableActivated,
 				foreignSchemaName,
 				primarySchemaName,
+				customProperties
 			},
 			dbData,
 			schemaData,
@@ -334,11 +336,16 @@ module.exports = (baseProvider, options, app) => {
 				primaryTableActivated &&
 				foreignTableActivated;
 
+			const { foreignOnDelete, foreignOnUpdate, foreignMatch } = additionalPropertiesForForeignKey(customProperties);
+
 			const foreignKeyStatement = assignTemplates(templates.createForeignKeyConstraint, {
 				primaryTable: getNamePrefixedWithSchemaName(primaryTable, primarySchemaName || schemaData.schemaName),
 				name: name ? `CONSTRAINT ${wrapInQuotes(name)}` : '',
 				foreignKey: isActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey),
 				primaryKey: isActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey),
+				onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
+				onUpdate: foreignOnUpdate ? ` ON UPDATE ${foreignOnUpdate}` : '',
+				match: foreignMatch ? ` MATCH ${foreignMatch}` : '',
 			});
 
 			return {
@@ -358,6 +365,7 @@ module.exports = (baseProvider, options, app) => {
 				foreignTableActivated,
 				foreignSchemaName,
 				primarySchemaName,
+				customProperties,
 			},
 			dbData,
 			schemaData,
@@ -370,12 +378,17 @@ module.exports = (baseProvider, options, app) => {
 				primaryTableActivated &&
 				foreignTableActivated;
 
+			const { foreignOnDelete, foreignOnUpdate, foreignMatch } = additionalPropertiesForForeignKey(customProperties);
+
 			const foreignKeyStatement = assignTemplates(templates.createForeignKey, {
 				primaryTable: getNamePrefixedWithSchemaName(primaryTable, primarySchemaName || schemaData.schemaName),
 				foreignTable: getNamePrefixedWithSchemaName(foreignTable, foreignSchemaName || schemaData.schemaName),
 				name: name ? wrapInQuotes(name) : '',
 				foreignKey: isActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey),
 				primaryKey: isActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey),
+				onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
+				onUpdate: foreignOnUpdate ? ` ON UPDATE ${foreignOnUpdate}` : '',
+				match: foreignMatch ? ` MATCH ${foreignMatch}` : '',
 			});
 
 			return {

forward_engineering/helpers/constraintsHelper.js

@@ -69,6 +69,7 @@ module.exports = ({
 		};
 	};
 
+
 	const getConstraintsWarnings = (invalidConstraints = []) => {
 		if (_.isEmpty(invalidConstraints)) {
 			return '';
@@ -86,11 +87,19 @@ module.exports = ({
 		);
 	};
 
+	const additionalPropertiesForForeignKey = relationship => {
+		const foreignOnDelete = _.get(relationship, 'relationshipOnDelete', '');
+		const foreignOnUpdate = _.get(relationship, 'relationshipOnUpdate', '');
+		const foreignMatch = _.get(relationship, 'relationshipMatch', '');
+		return { foreignOnDelete, foreignOnUpdate, foreignMatch }
+	};
+
 	return {
 		generateConstraintsString,
 		foreignKeysToString,
 		foreignActiveKeysToString,
 		createKeyConstraint,
 		getConstraintsWarnings,
+		additionalPropertiesForForeignKey,
 	};
 };

properties_pane/model_level/modelLevelConfig.json

@@ -205,5 +205,47 @@ making sure that you maintain a proper JSON format.
 				"template": "textarea"
 			}
 		]
+	},
+	{
+		"lowerTab": "Relationships",
+		"structure": [
+			{
+				"propertyName": "On Delete",
+				"propertyKeyword": "relationshipOnDelete",
+				"propertyType": "select",
+				"options": [
+					"",
+					"NO ACTION",
+					"RESTRICT",
+					"CASCADE",
+					"SET NULL",
+					"SET DEFAULT"
+				]
+			},
+			{
+				"propertyName": "On Update",
+				"propertyKeyword": "relationshipOnUpdate",
+				"propertyType": "select",
+				"options": [
+					"",
+					"NO ACTION",
+					"RESTRICT",
+					"CASCADE",
+					"SET NULL",
+					"SET DEFAULT"
+				]
+			},
+			{
+				"propertyName": "Match",
+				"propertyKeyword": "relationshipMatch",
+				"propertyType": "select",
+				"options": [
+					"",
+					"SIMPLE",
+					"PARTIAL",
+					"FULL"
+				]
+			}
+		]
 	}
 ]

reverse_engineering/helpers/postgresHelpers/foreignKeysHelper.js

@@ -6,6 +6,36 @@ const setDependencies = app => {
 	_ = app.require('lodash');
 };
 
+const prepareDeleteAndUpdate = value => {
+	switch (value) {
+		case 'a':
+			return 'NO ACTION';
+		case 'r':
+			return 'RESTRICT';
+		case 'c':
+			return 'CASCADE';
+		case 'n':
+			return 'SET NULL';
+		case 'd':
+			return 'SET DEFAULT';
+		default:
+			return '';
+	}
+};
+
+const prepareMatch = value => {
+	switch (value) {
+		case 'f':
+			return 'FULL';
+		case 's':
+			return 'SIMPLE';
+		case 'p':
+			return 'PARTIAL';
+		default:
+			return '';
+	}
+};
+
 const prepareForeignKeys = (tableForeignKeys, tableName, schemaName, columns) => {
 	return _.map(tableForeignKeys, foreignKeyData => {
 		return {
@@ -17,6 +47,11 @@ const prepareForeignKeys = (tableForeignKeys, tableName, schemaName, columns) =>
 			childCollection: tableName,
 			childField: _.map(foreignKeyData.table_columns_positions, getColumnNameByPosition(columns)),
 			relationshipType: 'Foreign Key',
+			relationshipInfo: {
+				relationshipOnDelete: prepareDeleteAndUpdate(foreignKeyData.relationship_on_delete),
+				relationshipOnUpdate: prepareDeleteAndUpdate(foreignKeyData.relationship_on_update),
+				relationshipMatch: prepareMatch(foreignKeyData.relationship_match),
+			}
 		};
 	});
 };

reverse_engineering/helpers/queryConstants.js

@@ -176,6 +176,9 @@ const queryConstants = {
 	GET_TABLE_FOREIGN_KEYS: `
         SELECT pcon.conname AS relationship_name, 
                 pcon.conkey AS table_columns_positions,
+                pcon.confdeltype AS relationship_on_delete,
+                pcon.confupdtype AS relationship_on_update,
+                pcon.confmatchtype AS relationship_match,
                 pc_foreign_table.relname AS foreign_table_name, 
                 ARRAY(
                     SELECT column_name::text FROM unnest(pcon.confkey) AS column_position