From 3c0629bebafbf95ba2017e98a897b1214f10514b Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 4 Sep 2025 11:58:29 +0200 Subject: [PATCH 1/2] HCK-12556: Technical name property in relationships with coupling and naming convention --- .../alterScriptHelpers/alterRelationshipsHelper.js | 8 ++++---- forward_engineering/ddlProvider/ddlProvider.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js index 5991fd5..d8a12c8 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js @@ -30,7 +30,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, @@ -57,7 +57,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, @@ -93,7 +93,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); @@ -115,7 +115,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)); diff --git a/forward_engineering/ddlProvider/ddlProvider.js b/forward_engineering/ddlProvider/ddlProvider.js index e7ea3b9..520db51 100644 --- a/forward_engineering/ddlProvider/ddlProvider.js +++ b/forward_engineering/ddlProvider/ddlProvider.js @@ -440,8 +440,8 @@ module.exports = (baseProvider, options, app) => { additionalPropertiesForForeignKey(customProperties); const foreignKeyStatement = assignTemplates(templates.createForeignKey, { - primaryTable: getNamePrefixedWithSchemaName(primaryTable, primarySchemaName || schemaData.schemaName), - foreignTable: getNamePrefixedWithSchemaName(foreignTable, foreignSchemaName || schemaData.schemaName), + primaryTable: getNamePrefixedWithSchemaName(primaryTable, primarySchemaName || schemaData?.schemaName), + foreignTable: getNamePrefixedWithSchemaName(foreignTable, foreignSchemaName || schemaData?.schemaName), name: name ? wrapInQuotes(name) : '', foreignKey: areKeysActivated ? foreignKeysToString(foreignKey) : foreignActiveKeysToString(foreignKey), primaryKey: areKeysActivated ? foreignKeysToString(primaryKey) : foreignActiveKeysToString(primaryKey), From 513e055ea86b576eea8bcf500a677fffb4b5efc0 Mon Sep 17 00:00:00 2001 From: Alik Rakhmonov Date: Thu, 4 Sep 2025 12:04:48 +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 d8a12c8..700db96 100644 --- a/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js +++ b/forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js @@ -6,7 +6,7 @@ const { AlterRelationshipDto } = require('../types/AlterRelationshipDto'); * @return string * */ const getRelationshipName = relationship => { - return relationship.role.name; + return relationship.role.code || relationship.role.name; }; /**