HHH-19614 fix bug where @manytoone(optional=false) FKs for single table inheritance were 'not null'

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java

@@ -1757,7 +1757,7 @@ public void processSecondPasses(MetadataBuildingContext buildingContext) {
 
 			processFkSecondPassesInOrder();
 
-			processSecondPasses(createKeySecondPassList);
+			processSecondPasses( createKeySecondPassList );
 			processSecondPasses( secondaryTableSecondPassList );
 
 			processSecondPasses( querySecondPassList );

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

@@ -129,7 +129,7 @@ else if ( columnsAnn != null ) {
 		else if ( joinColumns == null
 				&& ( property.hasDirectAnnotationUsage( OneToMany.class )
 						|| property.hasDirectAnnotationUsage( ElementCollection.class ) ) ) {
-			OneToMany oneToMany = property.getDirectAnnotationUsage( OneToMany.class );
+			final OneToMany oneToMany = property.getDirectAnnotationUsage( OneToMany.class );
 			joinColumns = AnnotatedJoinColumns.buildJoinColumns(
 					null,
 					oneToMany == null ? null : nullIfEmpty( oneToMany.mappedBy() ),

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

@@ -220,12 +220,11 @@ public static void bindEntityClass(
 			superEntity.addSubclass( subclass );
 		}
 
-		persistentClass.createConstraints( context );
-
 		collector.addEntityBinding( persistentClass );
 		// process secondary tables and complementary definitions (ie o.h.a.Table)
 		collector.addSecondPass( new SecondaryTableFromAnnotationSecondPass( entityBinder, holder ) );
 		collector.addSecondPass( new SecondaryTableSecondPass( entityBinder, holder ) );
+		collector.addSecondPass( ignored -> persistentClass.createConstraints( context ) );
 		// comment, checkConstraint, and indexes are processed here
 		entityBinder.processComplementaryTableDefinitions();
 		resolveLifecycleCallbacks( clazzToProcess, persistentClass, context.getMetadataCollector() );

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

@@ -859,6 +859,7 @@ private AnnotatedColumns bindProperty(
 		else if ( isManyToOne( property ) ) {
 			bindManyToOne(
 					propertyHolder,
+					nullability,
 					inferredData,
 					isIdentifierMapper,
 					inSecondPass,
@@ -870,6 +871,7 @@ else if ( isManyToOne( property ) ) {
 		else if ( isOneToOne( property ) ) {
 			bindOneToOne(
 					propertyHolder,
+					nullability,
 					inferredData,
 					isIdentifierMapper,
 					inSecondPass,

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

@@ -71,6 +71,7 @@ public class ToOneBinder {
 
 	static void bindManyToOne(
 			PropertyHolder propertyHolder,
+			Nullability nullability,
 			PropertyData inferredData,
 			boolean isIdentifierMapper,
 			boolean inSecondPass,
@@ -102,6 +103,7 @@ && isIdentifier( propertyHolder, propertyBinder, isIdentifierMapper ) ) {
 				aggregateCascadeTypes( manyToOne.cascade(), hibernateCascade, false, context ),
 				joinColumns,
 				propertyHolder,
+				nullability,
 				inferredData,
 				manyToOne.fetch(),
 				manyToOne.optional(),
@@ -140,6 +142,7 @@ private static void bindManyToOne(
 			EnumSet<CascadeType> cascadeStrategy,
 			AnnotatedJoinColumns joinColumns,
 			PropertyHolder propertyHolder,
+			Nullability nullability,
 			PropertyData inferredData,
 			FetchType fetchType,
 			boolean explicitlyOptional,
@@ -172,7 +175,7 @@ private static void bindManyToOne(
 		manyToOne.setNotFoundAction( notFoundAction );
 		manyToOne.setOnDeleteAction( onDeleteAction );
 		//value.setLazy( fetchMode != FetchMode.JOIN );
-		if ( !optional ) {
+		if ( !optional && nullability != Nullability.FORCED_NULL ) {
 			for ( AnnotatedJoinColumn column : joinColumns.getJoinColumns() ) {
 				column.setNullable( false );
 			}
@@ -413,6 +416,7 @@ else if ( oneToOne != null ) {
 
 	static void bindOneToOne(
 			PropertyHolder propertyHolder,
+			Nullability nullability,
 			PropertyData inferredData,
 			boolean isIdentifierMapper,
 			boolean inSecondPass,
@@ -449,6 +453,7 @@ static void bindOneToOne(
 				oneToOne.optional(),
 				oneToOne.fetch(),
 				propertyHolder,
+				nullability,
 				inferredData,
 				nullIfEmpty( oneToOne.mappedBy() ),
 				trueOneToOne,
@@ -465,6 +470,7 @@ private static void bindOneToOne(
 			boolean explicitlyOptional,
 			FetchType fetchMode,
 			PropertyHolder propertyHolder,
+			Nullability nullability,
 			PropertyData inferredData,
 			String mappedBy,
 			boolean trueOneToOne,
@@ -492,6 +498,7 @@ private static void bindOneToOne(
 					cascadeStrategy,
 					joinColumns,
 					propertyHolder,
+					nullability,
 					inferredData,
 					fetchMode,
 					explicitlyOptional,