Relationships that exist between deactivated entities are now also deactivated. Deactivated columns are now commented out

Author: unknown

forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js

@@ -25,9 +25,12 @@ const getFullChildTableName = (_) => (relationship) => {
 }
 
 /**
- * @return {(relationship: AlterRelationshipDto) => string}
+ * @return {(relationship: AlterRelationshipDto) => {
+ *     isActivated: boolean,
+ *     statement: string,
+ * }}
  * */
-const getAddSingleForeignKeyScript = (ddlProvider, _) => (relationship) => {
+const getAddSingleForeignKeyStatementDto = (ddlProvider, _) => (relationship) => {
     const compMod = relationship.role.compMod;
 
     const relationshipName = compMod.name?.new || getRelationshipName(relationship) || '';
@@ -43,7 +46,8 @@ const getAddSingleForeignKeyScript = (ddlProvider, _) => (relationship) => {
         primaryTable: compMod.parent.collection.name,
         primarySchemaName: compMod.parent.bucket.name,
         primaryTableActivated: compMod.parent.collection.isActivated,
-    }).statement;
+        isActivated: Boolean(relationship.role?.compMod?.isActivated?.new),
+    });
 }
 
 /**
@@ -73,26 +77,35 @@ const getAddForeignKeyScriptDtos = (ddlProvider, _) => (addedRelationships) => {
     return addedRelationships
         .filter((relationship) => canRelationshipBeAdded(relationship))
         .map(relationship => {
-            const script = getAddSingleForeignKeyScript(ddlProvider, _)(relationship);
-            const isActivated = Boolean(relationship.role?.compMod?.isActivated?.new);
-            return AlterScriptDto.getInstance([script], isActivated, false);
+            const scriptDto = getAddSingleForeignKeyStatementDto(ddlProvider, _)(relationship);
+            return AlterScriptDto.getInstance([scriptDto.statement], scriptDto.isActivated, false);
         })
         .filter(Boolean)
         .filter(res => res.scripts.some(scriptDto => Boolean(scriptDto.script)));
 }
 
 /**
- * @return {(relationship: AlterRelationshipDto) => string}
+ * @return {(relationship: AlterRelationshipDto) => {
+ *     isActivated: boolean,
+ *     statement: string,
+ * }}
  * */
-const getDeleteSingleForeignKeyScript = (ddlProvider, _) => (relationship) => {
+const getDeleteSingleForeignKeyStatementDto = (ddlProvider, _) => (relationship) => {
     const {wrapInQuotes} = require('../../utils/general')(_);
     const compMod = relationship.role.compMod;
 
     const ddlChildEntityName = getFullChildTableName(_)(relationship);
 
     const relationshipName = compMod.name?.old || getRelationshipName(relationship) || '';
     const ddlRelationshipName = wrapInQuotes(relationshipName);
-    return ddlProvider.dropForeignKey(ddlChildEntityName, ddlRelationshipName);
+    const statement = ddlProvider.dropForeignKey(ddlChildEntityName, ddlRelationshipName);
+
+    const isRelationshipActivated = Boolean(relationship.role?.compMod?.isActivated?.new);
+    const isChildTableActivated = compMod.child.collection.isActivated;
+    return {
+        statement,
+        isActivated: isRelationshipActivated && isChildTableActivated,
+    }
 }
 
 /**
@@ -118,9 +131,8 @@ const getDeleteForeignKeyScriptDtos = (ddlProvider, _) => (deletedRelationships)
     return deletedRelationships
         .filter((relationship) => canRelationshipBeDeleted(relationship))
         .map(relationship => {
-            const script = getDeleteSingleForeignKeyScript(ddlProvider, _)(relationship);
-            const isActivated = Boolean(relationship.role?.compMod?.isActivated?.new);
-            return AlterScriptDto.getInstance([script], isActivated, true);
+            const scriptDto = getDeleteSingleForeignKeyStatementDto(ddlProvider, _)(relationship);
+            return AlterScriptDto.getInstance([scriptDto.statement], scriptDto.isActivated, true);
         })
         .filter(Boolean)
         .filter(res => res.scripts.some(scriptDto => Boolean(scriptDto.script)));
@@ -133,10 +145,10 @@ const getModifyForeignKeyScriptDtos = (ddlProvider, _) => (modifiedRelationships
     return modifiedRelationships
         .filter(relationship => canRelationshipBeAdded(relationship) && canRelationshipBeDeleted(relationship))
         .map(relationship => {
-            const deleteScript = getDeleteSingleForeignKeyScript(ddlProvider, _)(relationship);
-            const addScript = getAddSingleForeignKeyScript(ddlProvider, _)(relationship);
-            const isActivated = Boolean(relationship.role?.compMod?.isActivated?.new);
-            return AlterScriptDto.getDropAndRecreateInstance(deleteScript, addScript, isActivated);
+            const deleteScriptDto = getDeleteSingleForeignKeyStatementDto(ddlProvider, _)(relationship);
+            const addScriptDto = getAddSingleForeignKeyStatementDto(ddlProvider, _)(relationship);
+            const isActivated = addScriptDto.isActivated && deleteScriptDto.isActivated;
+            return AlterScriptDto.getDropAndRecreateInstance(deleteScriptDto.statement, addScriptDto.statement, isActivated);
         })
         .filter(Boolean)
         .filter(res => res.scripts.some(scriptDto => Boolean(scriptDto.script)));

forward_engineering/ddlProvider/ddlProvider.js

@@ -368,29 +368,28 @@ module.exports = (baseProvider, options, app) => {
 		) {
 			const isAllPrimaryKeysDeactivated = checkAllKeysDeactivated(primaryKey);
 			const isAllForeignKeysDeactivated = checkAllKeysDeactivated(foreignKey);
-			const isRelationshipActivated =
+			const areKeysActivated =
 				!isAllPrimaryKeysDeactivated &&
 				!isAllForeignKeysDeactivated &&
 				primaryTableActivated &&
-				foreignTableActivated &&
-				isActivated;
+				foreignTableActivated;
 
 			const { foreignOnDelete, foreignOnUpdate, foreignMatch } =
 				additionalPropertiesForForeignKey(customProperties);
 
 			const foreignKeyStatement = assignTemplates(templates.createForeignKeyConstraint, {
 				primaryTable: getNamePrefixedWithSchemaName(primaryTable, primarySchemaName || schemaData.schemaName),
 				name: name ? `CONSTRAINT ${wrapInQuotes(name)}` : '',
-				foreignKey: isRelationshipActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey),
-				primaryKey: isRelationshipActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey),
+				foreignKey: areKeysActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey),
+				primaryKey: areKeysActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey),
 				onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
 				onUpdate: foreignOnUpdate ? ` ON UPDATE ${foreignOnUpdate}` : '',
 				match: foreignMatch ? ` MATCH ${foreignMatch}` : '',
 			});
 
 			return {
 				statement: _.trim(foreignKeyStatement),
-				isActivated: isRelationshipActivated,
+				isActivated: areKeysActivated && isActivated,
 			};
 		},
 
@@ -444,12 +443,11 @@ module.exports = (baseProvider, options, app) => {
 		) {
 			const isAllPrimaryKeysDeactivated = checkAllKeysDeactivated(primaryKey);
 			const isAllForeignKeysDeactivated = checkAllKeysDeactivated(foreignKey);
-			const isRelationshipActivated =
+			const areKeysActivated =
 				!isAllPrimaryKeysDeactivated &&
 				!isAllForeignKeysDeactivated &&
 				primaryTableActivated &&
-				foreignTableActivated &&
-				isActivated;
+				foreignTableActivated;
 
 			const { foreignOnDelete, foreignOnUpdate, foreignMatch } =
 				additionalPropertiesForForeignKey(customProperties);
@@ -458,16 +456,16 @@ module.exports = (baseProvider, options, app) => {
 				primaryTable: getNamePrefixedWithSchemaName(primaryTable, primarySchemaName || schemaData.schemaName),
 				foreignTable: getNamePrefixedWithSchemaName(foreignTable, foreignSchemaName || schemaData.schemaName),
 				name: name ? wrapInQuotes(name) : '',
-				foreignKey: isRelationshipActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey),
-				primaryKey: isRelationshipActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey),
+				foreignKey: areKeysActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey),
+				primaryKey: areKeysActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey),
 				onDelete: foreignOnDelete ? ` ON DELETE ${foreignOnDelete}` : '',
 				onUpdate: foreignOnUpdate ? ` ON UPDATE ${foreignOnUpdate}` : '',
 				match: foreignMatch ? ` MATCH ${foreignMatch}` : '',
 			});
 
 			return {
 				statement: _.trim(foreignKeyStatement),
-				isActivated: isRelationshipActivated,
+				isActivated: areKeysActivated && isActivated,
 			};
 		},