Skip to content

Commit d9d0ad1

Browse files
HCK-12556: Technical name property in relationships with coupling and naming convention (#157)
* HCK-12556: Technical name property in relationships with coupling and naming convention * fix: get code
1 parent e89ed39 commit d9d0ad1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

forward_engineering/alterScript/alterScriptHelpers/alterRelationshipsHelper.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const { getNamePrefixedWithSchemaName, wrapInQuotes } = require('../../utils/gen
88
* @return string
99
* */
1010
const getRelationshipName = relationship => {
11-
return relationship.role.name;
11+
return relationship.role.code || relationship.role.name;
1212
};
1313

1414
/**
@@ -32,7 +32,7 @@ const getFullChildTableName = relationship => {
3232
const getAddSingleForeignKeyStatementDto = ddlProvider => relationship => {
3333
const compMod = relationship.role.compMod;
3434

35-
const relationshipName = compMod.name?.new || getRelationshipName(relationship) || '';
35+
const relationshipName = compMod.code?.new || compMod.name?.new || getRelationshipName(relationship) || '';
3636

3737
return ddlProvider.createForeignKey({
3838
name: relationshipName,
@@ -59,7 +59,7 @@ const canRelationshipBeAdded = relationship => {
5959
return false;
6060
}
6161
return [
62-
compMod.name?.new || getRelationshipName(relationship),
62+
compMod.code?.new || compMod.name?.new || getRelationshipName(relationship),
6363
compMod.parent?.bucket,
6464
compMod.parent?.collection,
6565
compMod.parent?.collection?.fkFields?.length,
@@ -94,7 +94,7 @@ const getDeleteSingleForeignKeyStatementDto = ddlProvider => relationship => {
9494

9595
const ddlChildEntityName = getFullChildTableName(relationship);
9696

97-
const relationshipName = compMod.name?.old || getRelationshipName(relationship) || '';
97+
const relationshipName = compMod.code?.old || compMod.name?.old || getRelationshipName(relationship) || '';
9898
const ddlRelationshipName = wrapInQuotes(relationshipName);
9999
const statement = ddlProvider.dropForeignKey(ddlChildEntityName, ddlRelationshipName);
100100

@@ -116,7 +116,7 @@ const canRelationshipBeDeleted = relationship => {
116116
return false;
117117
}
118118
return [
119-
compMod.name?.old || getRelationshipName(relationship),
119+
compMod.code?.old || compMod.name?.old || getRelationshipName(relationship),
120120
compMod.child?.bucket,
121121
compMod.child?.collection,
122122
].every(property => Boolean(property));

0 commit comments

Comments
 (0)