From 9b4b46e50dbecc661814942b3468a22bd0f37cde Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 4 Sep 2025 11:23:49 +0200 Subject: [PATCH 1/2] HCK-12556: Technical name property in relationships with coupling and naming convention --- .../alterScriptHelpers/alterRelationshipsHelper.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js index e23ae33..c4ff0d2 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js @@ -32,7 +32,7 @@ const getFullChildTableName = 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, @@ -59,7 +59,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, @@ -94,7 +94,7 @@ const getDeleteSingleForeignKeyStatementDto = ddlProvider => relationship => { const ddlChildEntityName = getFullChildTableName(relationship); - const relationshipName = compMod.name?.old || getRelationshipName(relationship) || ''; + const relationshipName = compMod.code?.old || compMod.name?.old || getRelationshipName(relationship) || ''; const ddlRelationshipName = wrapInQuotes(relationshipName); const statement = ddlProvider.dropForeignKey(ddlChildEntityName, ddlRelationshipName); @@ -116,7 +116,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)); From 781d2ac94ab1223a4166af5b0c23de330e275ef7 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 4 Sep 2025 12:05:02 +0200 Subject: [PATCH 2/2] fix: get code --- .../alterScript/alterScriptHelpers/alterRelationshipsHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js index c4ff0d2..2b0dbf4 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js @@ -8,7 +8,7 @@ const { getNamePrefixedWithSchemaName, wrapInQuotes } = require('../../utils/gen * @return string * */ const getRelationshipName = relationship => { - return relationship.role.name; + return relationship.role.code || relationship.role.name; }; /**