Merge pull request #76 from ArzamastsevVladyslav/fix/HCK-4261-missing-deferrable-clause-on-constraints

Fix/hck 4261 missing deferrable clause on constraints

Author: Sasha

forward_engineering/ddlProvider/ddlHelpers/constraintsHelper.js

@@ -80,6 +80,9 @@ module.exports = ({
             : '';
         const storageParameters = keyData.storageParameters ? ` WITH (${keyData.storageParameters})` : '';
         const tablespace = keyData.tablespace ? ` USING INDEX TABLESPACE ${wrapInQuotes(keyData.tablespace)}` : '';
+        const deferrable = keyData?.deferrable ? ` ${keyData.deferrable}` : '';
+        const deferrableConstraintCheckTime = keyData?.deferrable === 'DEFERRABLE' && keyData?.deferrableConstraintCheckTime
+            ? ` ${keyData?.deferrableConstraintCheckTime}` : '';
 
         return {
             statement: assignTemplates(templates.createKeyConstraint, {
@@ -89,6 +92,8 @@ module.exports = ({
                 includeNonKey,
                 storageParameters,
                 tablespace,
+                deferrable,
+                deferrableConstraintCheckTime,
             }),
             isActivated: !isAllColumnsDeactivated,
         };
@@ -111,11 +116,29 @@ module.exports = ({
         );
     };
 
-    const additionalPropertiesForForeignKey = relationship => {
-        const foreignOnDelete = _.get(relationship, 'relationshipOnDelete', '');
-        const foreignOnUpdate = _.get(relationship, 'relationshipOnUpdate', '');
-        const foreignMatch = _.get(relationship, 'relationshipMatch', '');
-        return {foreignOnDelete, foreignOnUpdate, foreignMatch};
+    /**
+     * @param relationshipCustomProperties {{
+     *     relationshipOnDelete?: string,
+     *     relationshipOnUpdate?: string,
+     *     relationshipMatch?: string,
+     *     deferrable?: "" | "DEFERRABLE" | "NOT DEFERRABLE",
+     *     deferrableConstraintCheckTime?: "" | "INITIALLY IMMEDIATE" | "INITIALLY DEFERRED",
+     * }}
+     * @return {{
+     *     relationshipOnDelete: string,
+     *     relationshipOnUpdate: string,
+     *     relationshipMatch: string,
+     *     deferrable: string,
+     *     deferrableConstraintCheckTime: string,
+     * }}
+     * */
+    const additionalPropertiesForForeignKey = relationshipCustomProperties => {
+        const foreignOnDelete = _.get(relationshipCustomProperties, 'relationshipOnDelete', '');
+        const foreignOnUpdate = _.get(relationshipCustomProperties, 'relationshipOnUpdate', '');
+        const foreignMatch = _.get(relationshipCustomProperties, 'relationshipMatch', '');
+        const deferrable = _.get(relationshipCustomProperties, 'deferrable', '');
+        const deferrableConstraintCheckTime = _.get(relationshipCustomProperties, 'deferrableConstraintCheckTime', '');
+        return {foreignOnDelete, foreignOnUpdate, foreignMatch, deferrable, deferrableConstraintCheckTime};
     };
 
     return {

forward_engineering/ddlProvider/ddlHelpers/keyHelper.js

@@ -59,6 +59,8 @@ module.exports = (_, clean) => {
 			comment: options['indexComment'],
 			tablespace: options['indexTablespace'],
 			nullsDistinct: options['nullsDistinct'],
+			deferrable: options['deferrable'],
+			deferrableConstraintCheckTime: options['deferrableConstraintCheckTime'],
 		});
 
 	const hydratePrimaryKeyOptions = (options, columnName, isActivated, jsonSchema) =>
@@ -75,6 +77,8 @@ module.exports = (_, clean) => {
 			storageParameters: options['indexStorageParameters'],
 			comment: options['indexComment'],
 			tablespace: options['indexTablespace'],
+			deferrable: options['deferrable'],
+			deferrableConstraintCheckTime: options['deferrableConstraintCheckTime'],
 		});
 
 	const findName = (keyId, properties) => {

forward_engineering/ddlProvider/ddlProvider.js

@@ -329,6 +329,8 @@ module.exports = (baseProvider, options, app) => {
 		 *     relationshipOnDelete?: string,
 		 *     relationshipOnUpdate?: string,
 		 *     relationshipMatch?: string,
+		 *     deferrable?: "" | "DEFERRABLE" | "NOT DEFERRABLE",
+		 *     deferrableConstraintCheckTime?: "" | "INITIALLY IMMEDIATE" | "INITIALLY DEFERRED",
 		 * }}
 		 * @param primaryTableActivated {boolean}
 		 * @param foreignTableActivated {boolean}
@@ -376,7 +378,7 @@ module.exports = (baseProvider, options, app) => {
 				primaryTableActivated &&
 				foreignTableActivated;
 
-			const { foreignOnDelete, foreignOnUpdate, foreignMatch } =
+			const { foreignOnDelete, foreignOnUpdate, foreignMatch, deferrable, deferrableConstraintCheckTime } =
 				additionalPropertiesForForeignKey(customProperties);
 
 			const foreignKeyStatement = assignTemplates(templates.createForeignKeyConstraint, {
@@ -387,6 +389,9 @@ module.exports = (baseProvider, options, app) => {
 				onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
 				onUpdate: foreignOnUpdate ? ` ON UPDATE ${foreignOnUpdate}` : '',
 				match: foreignMatch ? ` MATCH ${foreignMatch}` : '',
+				deferrable: deferrable ? ` ${deferrable}` : '',
+				deferrableConstraintCheckTime: deferrable === 'DEFERRABLE' && deferrableConstraintCheckTime
+					? ` ${deferrableConstraintCheckTime}` : '',
 			});
 
 			return {
@@ -451,7 +456,7 @@ module.exports = (baseProvider, options, app) => {
 				primaryTableActivated &&
 				foreignTableActivated;
 
-			const { foreignOnDelete, foreignOnUpdate, foreignMatch } =
+			const { foreignOnDelete, foreignOnUpdate, foreignMatch, deferrable, deferrableConstraintCheckTime } =
 				additionalPropertiesForForeignKey(customProperties);
 
 			const foreignKeyStatement = assignTemplates(templates.createForeignKey, {
@@ -463,6 +468,9 @@ module.exports = (baseProvider, options, app) => {
 				onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
 				onUpdate: foreignOnUpdate ? ` ON UPDATE ${foreignOnUpdate}` : '',
 				match: foreignMatch ? ` MATCH ${foreignMatch}` : '',
+				deferrable: deferrable ? ` ${deferrable}` : '',
+				deferrableConstraintCheckTime: deferrable === 'DEFERRABLE' && deferrableConstraintCheckTime
+					? ` ${deferrableConstraintCheckTime}` : '',
 			});
 
 			return {

forward_engineering/ddlProvider/templates.js

@@ -20,9 +20,9 @@ module.exports = {
 
 	checkConstraint: '${name} CHECK (${expression})${noInherit}',
 
-	createForeignKeyConstraint: '${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})${match}${onDelete}${onUpdate}',
+	createForeignKeyConstraint: '${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable} (${primaryKey})${match}${onDelete}${onUpdate}${deferrable}${deferrableConstraintCheckTime}',
 
-	createKeyConstraint: '${constraintName}${keyType}${columns}${includeNonKey}${storageParameters}${tablespace}',
+	createKeyConstraint: '${constraintName}${keyType}${columns}${includeNonKey}${storageParameters}${tablespace}${deferrable}${deferrableConstraintCheckTime}',
 
 	alterColumnType: 'ALTER TABLE IF EXISTS ${tableName} ALTER COLUMN ${columnName} SET DATA TYPE ${dataType};',
 
@@ -37,7 +37,7 @@ module.exports = {
 	dropConstraint: 'ALTER TABLE IF EXISTS ${tableName} DROP CONSTRAINT IF EXISTS ${constraintName};',
 
 	createForeignKey:
-		'ALTER TABLE IF EXISTS ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable}(${primaryKey})${match}${onDelete}${onUpdate};',
+		'ALTER TABLE IF EXISTS ${foreignTable} ADD CONSTRAINT ${name} FOREIGN KEY (${foreignKey}) REFERENCES ${primaryTable}(${primaryKey})${match}${onDelete}${onUpdate}${deferrable}${deferrableConstraintCheckTime};',
 
 	dropForeignKey: 'ALTER TABLE ${tableName} DROP CONSTRAINT ${fkConstraintName};',
 

properties_pane/entity_level/entityLevelConfig.json

@@ -709,6 +709,26 @@ making sure that you maintain a proper JSON format.
 						"addTimestampButton": false,
 						"propertyType": "details",
 						"template": "textarea"
+					},
+					{
+						"propertyName": "Deferrable",
+						"propertyKeyword": "deferrable",
+						"propertyTooltip": "\nA constraint that is not deferrable will be checked immediately after every command. Checking of constraints that are deferrable can be postponed until the end of the transaction",
+						"propertyType": "select",
+						"defaultValue": "",
+						"options": ["", "DEFERRABLE", "NOT DEFERRABLE"]
+					},
+					{
+						"propertyName": "Check time",
+						"propertyKeyword": "deferrableConstraintCheckTime",
+						"propertyTooltip": "\nIf the constraint is INITIALLY IMMEDIATE, it is checked after each statement. This is the default. If the constraint is INITIALLY DEFERRED, it is checked only at the end of the transaction",
+						"propertyType": "select",
+						"defaultValue": "",
+						"options": ["", "INITIALLY IMMEDIATE", "INITIALLY DEFERRED"],
+						"dependency": {
+							"key": "deferrable",
+							"value": "DEFERRABLE"
+						}
 					}
 				],
 				"disabledOnCondition": [
@@ -824,6 +844,26 @@ making sure that you maintain a proper JSON format.
 								}
 							]
 						}
+					},
+					{
+						"propertyName": "Deferrable",
+						"propertyKeyword": "deferrable",
+						"propertyTooltip": "\nA constraint that is not deferrable will be checked immediately after every command. Checking of constraints that are deferrable can be postponed until the end of the transaction",
+						"propertyType": "select",
+						"defaultValue": "",
+						"options": ["", "DEFERRABLE", "NOT DEFERRABLE"]
+					},
+					{
+						"propertyName": "Check time",
+						"propertyKeyword": "deferrableConstraintCheckTime",
+						"propertyTooltip": "\nIf the constraint is INITIALLY IMMEDIATE, it is checked after each statement. This is the default. If the constraint is INITIALLY DEFERRED, it is checked only at the end of the transaction",
+						"propertyType": "select",
+						"defaultValue": "",
+						"options": ["", "INITIALLY IMMEDIATE", "INITIALLY DEFERRED"],
+						"dependency": {
+							"key": "deferrable",
+							"value": "DEFERRABLE"
+						}
 					}
 				]
 			}