Merge pull request #4 from DrMyroslav/HCK-1630-oracle-fk-constraints

add to fk additional properties
hackolade · Sep 1, 2022 · abf393b · abf393b
2 parents f361c2a + 3cc7b49
commit abf393b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/forward_engineering/configs/templates.js b/forward_engineering/configs/templates.js
@@ -14,12 +14,12 @@ module.exports = {
 
     createKeyConstraint: '${constraintName}${keyType}${columns}',
 
-    createForeignKeyConstraint: '${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})',
+    createForeignKeyConstraint: '${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})${onDelete}',
 
     checkConstraint: '${name}CHECK (${expression})',
 
     createForeignKey:
-        'ALTER TABLE ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable}(${primaryKey});\n',
+        'ALTER TABLE ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})${onDelete};',
 
     createIndex: 'CREATE${indexType} INDEX ${name} ON ${tableName}${keys}${options};\n',
 

diff --git a/forward_engineering/ddlProvider.js b/forward_engineering/ddlProvider.js
@@ -49,6 +49,7 @@ module.exports = (baseProvider, options, app) => {
             foreignKeysToString,
             foreignActiveKeysToString,
             createKeyConstraint,
+            customPropertiesForForeignKey
         } = require('./helpers/tableHelper')({
         _,
         checkAllKeysDeactivated,
@@ -196,6 +197,7 @@ module.exports = (baseProvider, options, app) => {
                 foreignTableActivated,
                 foreignSchemaName,
                 primarySchemaName,
+                customProperties,
             },
             dbData,
             schemaData
@@ -211,11 +213,14 @@ module.exports = (baseProvider, options, app) => {
             const foreignKeys = toArray(foreignKey);
             const primaryKeys = toArray(primaryKey);
 
+            const { foreignOnDelete } = customPropertiesForForeignKey(customProperties);
+
             const foreignKeyStatement = assignTemplates(templates.createForeignKeyConstraint, {
                 primaryTable: getNamePrefixedWithSchemaName(primaryTable, primarySchemaName || schemaData.schemaName),
                 name: name ? `CONSTRAINT ${wrapInQuotes(name)}` : '',
                 foreignKey: isActivated ? foreignKeysToString(foreignKeys) : foreignActiveKeysToString(foreignKeys),
                 primaryKey: isActivated ? foreignKeysToString(primaryKeys) : foreignActiveKeysToString(primaryKeys),
+                onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
             });
 
             return {
@@ -235,6 +240,7 @@ module.exports = (baseProvider, options, app) => {
                 foreignTableActivated,
                 foreignSchemaName,
                 primarySchemaName,
+                customProperties,
             },
             dbData,
             schemaData
@@ -250,16 +256,19 @@ module.exports = (baseProvider, options, app) => {
             const foreignKeys = toArray(foreignKey);
             const primaryKeys = toArray(primaryKey);
 
+            const { foreignOnDelete } = customPropertiesForForeignKey(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(foreignKeys) : foreignActiveKeysToString(foreignKeys),
                 primaryKey: isActivated ? foreignKeysToString(primaryKeys) : foreignActiveKeysToString(primaryKeys),
+                onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
             });
 
             return {
-                statement: _.trim(foreignKeyStatement),
+                statement: _.trim(foreignKeyStatement) + '\n',
                 isActivated,
             };
         },

diff --git a/forward_engineering/helpers/tableHelper.js b/forward_engineering/helpers/tableHelper.js
@@ -242,12 +242,18 @@ module.exports = ({ _, getColumnsList, checkAllKeysDeactivated, commentIfDeactiv
         };
     };
 
+    const customPropertiesForForeignKey = relationship => {
+		const foreignOnDelete = _.get(relationship, 'relationshipOnDelete', '');
+		return { foreignOnDelete };
+	};
+
     return {
         getTableOptions,
         getTableType,
         generateConstraintsString,
         foreignKeysToString,
         foreignActiveKeysToString,
         createKeyConstraint,
+        customPropertiesForForeignKey,
     };
 };
diff --git a/properties_pane/model_level/modelLevelConfig.json b/properties_pane/model_level/modelLevelConfig.json
@@ -165,5 +165,20 @@ making sure that you maintain a proper JSON format.
 				"template": "textarea"
 			}
 		]
+	},
+	{
+		"lowerTab": "Relationships",
+		"structure": [
+			{
+				"propertyName": "On Delete",
+				"propertyKeyword": "relationshipOnDelete",
+				"propertyType": "select",
+				"options": [
+					"",
+					"CASCADE",
+					"SET NULL"
+				]
+			}
+		]
 	}
 ]