diff --git a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js index d75b260..150ccc1 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js @@ -7,7 +7,7 @@ const { getNamePrefixedWithSchemaNameForScriptFormat, prepareNameForScriptFormat * @return string * */ const getRelationshipName = relationship => { - return relationship.role.name; + return relationship.role.code || relationship.role.name; }; /** @@ -30,7 +30,7 @@ const getFullChildTableName = scriptFormat => relationship => { const getAddSingleForeignKeyStatementDto = ddlProvider => relationship => { const compMod = relationship.role.compMod; - const relationshipName = compMod.name?.new || getRelationshipName(relationship) || ''; + const relationshipName = compMod.code?.new || compMod.name?.new || getRelationshipName(relationship) || ''; return ddlProvider.createForeignKey({ name: relationshipName, @@ -56,7 +56,7 @@ const canRelationshipBeAdded = relationship => { return false; } return [ - compMod.name?.new || getRelationshipName(relationship), + compMod.code?.new || compMod.name?.new || getRelationshipName(relationship), compMod.parent?.bucket, compMod.parent?.collection, compMod.parent?.collection?.fkFields?.length, @@ -91,7 +91,7 @@ const getDeleteSingleForeignKeyStatementDto = (ddlProvider, scriptFormat) => rel const ddlChildEntityName = getFullChildTableName(scriptFormat)(relationship); - const relationshipName = compMod.name?.old || getRelationshipName(relationship) || ''; + const relationshipName = compMod.code?.old || compMod.name?.old || getRelationshipName(relationship) || ''; const ddlRelationshipName = prepareNameForScriptFormat(scriptFormat)(relationshipName); const statement = ddlProvider.dropForeignKey(ddlChildEntityName, ddlRelationshipName); @@ -113,7 +113,7 @@ const canRelationshipBeDeleted = relationship => { return false; } return [ - compMod.name?.old || getRelationshipName(relationship), + compMod.code?.old || compMod.name?.old || getRelationshipName(relationship), compMod.child?.bucket, compMod.child?.collection, ].every(property => Boolean(property));