Fix incremental changelog for relationships. (#16081)

jhipster · Aug 31, 2021 · 3c8f306 · 3c8f306
1 parent e391098
commit 3c8f306
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...emplates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs b/...emplates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs
@@ -104,10 +104,10 @@ if (hasFieldConstraint) { _%>
             const otherEntityConstraintName = getFKConstraintName(relationship.joinTable.name, getColumnName(relationshipName), prodDatabaseType);
     _%>
 
-        <addForeignKeyConstraint baseColumnNames="<%= primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(', ') %>"
+        <addForeignKeyConstraint baseColumnNames="<%= entity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(', ') %>"
                                  baseTableName="<%= relationship.joinTable.name %>"
                                  constraintName="<%= constraintName %>"
-                                 referencedColumnNames="<%= primaryKey.fields.map(field => field.columnName).join(', ') %>"
+                                 referencedColumnNames="<%= entity.primaryKey.fields.map(field => field.columnName).join(', ') %>"
                                  referencedTableName="<%= entityTableName %>"/>
 
         <addForeignKeyConstraint baseColumnNames="<%= relationship.otherEntity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(', ') %>"

diff --git a/test-integration/incremental-changelog-samples/liquibase-jdl-rename-field-post/app.jdl b/test-integration/incremental-changelog-samples/liquibase-jdl-rename-field-post/app.jdl
@@ -138,7 +138,7 @@ relationship ManyToOne {
   BankAccount{user(login)} to User
 }
 relationship ManyToMany {
-  Operation{theLabel(labelName)} to TheLabel{operation}
+  Operation{theLabel(labelName)} to TheLabel{operation(named)}
 }
 
 relationship OneToMany {