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

HHH-16937 Handle optional `@Any` and discriminator/key nullability

This commit is contained in:
Marco Belladelli 2023-08-07 11:45:05 +02:00
parent 241ed54acd
commit 72d1e10803
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/annotations/Any.java
View File

@ -102,6 +102,10 @@ public @interface Any {
/** /**
* Whether the association is optional. * Whether the association is optional.
* <p>
* If the discriminator {@link jakarta.persistence.Column Column} or the
* {@link jakarta.persistence.JoinColumn JoinColumn} are not nullable the
* association is always considered non-optional, regardless of this value.
* *
* @return {@code false} if the association cannot be null. * @return {@code false} if the association cannot be null.
*/ */

4
hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnyBinder.java
View File

@ -94,6 +94,7 @@ public class AnyBinder {
} }
final boolean lazy = any.fetch() == FetchType.LAZY; final boolean lazy = any.fetch() == FetchType.LAZY;
final boolean optional = any.optional();
final Any value = BinderHelper.buildAnyValue( final Any value = BinderHelper.buildAnyValue(
property.getAnnotation( Column.class ), property.getAnnotation( Column.class ),
getOverridableAnnotation( property, Formula.class, context ), getOverridableAnnotation( property, Formula.class, context ),
@ -104,7 +105,7 @@ public class AnyBinder {
nullability, nullability,
propertyHolder, propertyHolder,
entityBinder, entityBinder,
any.optional(), optional,
context context
); );
@ -121,6 +122,7 @@ public class AnyBinder {
binder.setCascade( cascadeStrategy ); binder.setCascade( cascadeStrategy );
binder.setBuildingContext( context ); binder.setBuildingContext( context );
Property prop = binder.makeProperty(); Property prop = binder.makeProperty();
prop.setOptional( optional && value.isNullable() );
//composite FK columns are in the same table, so it's OK //composite FK columns are in the same table, so it's OK
propertyHolder.addProperty( prop, columns, inferredData.getDeclaringClass() ); propertyHolder.addProperty( prop, columns, inferredData.getDeclaringClass() );
} }