diff --git a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js index 2765f09..a628afa 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js @@ -42,6 +42,7 @@ const getAddSingleForeignKeyStatementDto = (ddlProvider, _) => relationship => { primaryTable: compMod.parent.collection.name, primarySchemaName: compMod.parent.bucket.name, foreignSchemaName: compMod.child.bucket.name, + isActivated: compMod.isActivated?.new, }); }; diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js index 99990a8..f07a1af 100644 --- a/forward_engineering/ddlProvider/ddlProvider.js +++ b/forward_engineering/ddlProvider/ddlProvider.js @@ -304,6 +304,7 @@ module.exports = (baseProvider, options, app) => { primaryTableActivated, foreignTableActivated, primarySchemaName, + isActivated: isRelationshipActivated, }, dbData, schemaData, @@ -323,7 +324,7 @@ module.exports = (baseProvider, options, app) => { foreignKey: isActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey), primaryKey: isActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey), }), - isActivated, + isActivated: isActivated && isRelationshipActivated !== false, }; }, @@ -359,6 +360,7 @@ module.exports = (baseProvider, options, app) => { foreignTableActivated, foreignSchemaName, primarySchemaName, + isActivated: isRelationshipActivated, }, dbData, schemaData, @@ -378,7 +380,8 @@ module.exports = (baseProvider, options, app) => { !isAllPrimaryKeysDeactivated && !isAllForeignKeysDeactivated && primaryTableActivated && - foreignTableActivated, + foreignTableActivated && + isRelationshipActivated !== false, }; },