Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10385 HHH-10386 - Fix the @JoinColumn foreignKey is not taken into consideration when generating the association database schema

This commit is contained in:
Andrea Boriero 2015-12-18 10:01:48 +00:00
parent 504dd8353d
commit 8670b4211e
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hibernate-core/src/main/java/org/hibernate/cfg/annotations/CollectionBinder.java
View File

@ -1115,12 +1115,22 @@ public abstract class CollectionBinder {
else { else {
final JoinTable joinTableAnn = property.getAnnotation( JoinTable.class ); final JoinTable joinTableAnn = property.getAnnotation( JoinTable.class );
if ( joinTableAnn != null ) { if ( joinTableAnn != null ) {
if ( joinTableAnn.foreignKey().value() == ConstraintMode.NO_CONSTRAINT ) { String foreignKeyName = joinTableAnn.foreignKey().name();
ConstraintMode foreignKeyValue = joinTableAnn.foreignKey().value();
if ( joinTableAnn.joinColumns().length != 0 ) {
final JoinColumn joinColumnAnn = joinTableAnn.joinColumns()[0];
if ( "".equals( foreignKeyName ) ) {
foreignKeyName = joinColumnAnn.foreignKey().name();
}
if ( foreignKeyValue != ConstraintMode.NO_CONSTRAINT ) {
foreignKeyValue = joinColumnAnn.foreignKey().value();
}
}
if ( foreignKeyValue == ConstraintMode.NO_CONSTRAINT ) {
key.setForeignKeyName( "none" ); key.setForeignKeyName( "none" );
} }
else { else {
key.setForeignKeyName( StringHelper.nullIfEmpty( joinTableAnn.foreignKey().name() ) ); key.setForeignKeyName( StringHelper.nullIfEmpty( foreignKeyName ) );
} }
} }
else { else {
@ -1309,11 +1319,22 @@ public abstract class CollectionBinder {
else { else {
final JoinTable joinTableAnn = property.getAnnotation( JoinTable.class ); final JoinTable joinTableAnn = property.getAnnotation( JoinTable.class );
if ( joinTableAnn != null ) { if ( joinTableAnn != null ) {
String foreignKeyName = joinTableAnn.inverseForeignKey().name();
ConstraintMode foreignKeyValue = joinTableAnn.foreignKey().value();
if ( joinTableAnn.inverseJoinColumns().length != 0 ) {
final JoinColumn joinColumnAnn = joinTableAnn.inverseJoinColumns()[0];
if ( "".equals( foreignKeyName ) ) {
foreignKeyName = joinColumnAnn.foreignKey().name();
}
if ( foreignKeyValue != ConstraintMode.NO_CONSTRAINT ) {
foreignKeyValue = joinColumnAnn.foreignKey().value();
}
}
if ( joinTableAnn.foreignKey().value() == ConstraintMode.NO_CONSTRAINT ) { if ( joinTableAnn.foreignKey().value() == ConstraintMode.NO_CONSTRAINT ) {
element.setForeignKeyName( "none" ); element.setForeignKeyName( "none" );
} }
else { else {
element.setForeignKeyName( StringHelper.nullIfEmpty( joinTableAnn.inverseForeignKey().name() ) ); element.setForeignKeyName( StringHelper.nullIfEmpty( foreignKeyName ) );
} }
} }
} }