Skip to content

Commit 7294cb2

Browse files
committed
HHH-19118 fix @joincolumn(columnDefinition) which was previously ignored
1 parent 98ec951 commit 7294cb2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedJoinColumn.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ public void linkValueUsingDefaultColumnNaming(
316316
Column referencedColumn,
317317
PersistentClass referencedEntity,
318318
SimpleValue value) {
319-
int columnIndex = getParent().getJoinColumns().indexOf(this);
319+
final int columnIndex = getParent().getJoinColumns().indexOf( this );
320320
linkValueUsingDefaultColumnNaming( columnIndex, referencedColumn, referencedEntity, value );
321321
}
322322

@@ -343,7 +343,9 @@ public void linkValueUsingDefaultColumnNaming(
343343
referencedColumn.getTemporalPrecision(),
344344
referencedColumn.getArrayLength(),
345345
mappingColumn != null && mappingColumn.isNullable(),
346-
referencedColumn.getSqlType(),
346+
mappingColumn != null && mappingColumn.getSqlType() != null
347+
? mappingColumn.getSqlType()
348+
: referencedColumn.getSqlType(),
347349
mappingColumn != null && mappingColumn.isUnique(),
348350
false
349351
);

0 commit comments

Comments
 (0)