HHH-19840 Fix detection of post insert/update generated values

mbellade · mbellade · commit 900cbe8ac306 · 2025-10-10T09:15:26.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java b/hibernate-core/src/main/java/org/hibernate/tuple/entity/EntityMetamodel.java
@@ -354,8 +354,9 @@ public EntityMetamodel(
 							propertyInsertability[i] = writePropertyValue( (OnExecutionGenerator) generator );
 						}
 						foundPostInsertGeneratedValues = foundPostInsertGeneratedValues
-								|| generator instanceof OnExecutionGenerator;
+								|| generatedOnExecution;
 						foundPreInsertGeneratedValues = foundPreInsertGeneratedValues
+								|| !generatedOnExecution
 								|| generator instanceof BeforeExecutionGenerator;
 					}
 					else if ( !allowMutation ) {
@@ -365,9 +366,10 @@ else if ( !allowMutation ) {
 						if ( generatedOnExecution ) {
 							propertyUpdateability[i] = writePropertyValue( (OnExecutionGenerator) generator );
 						}
-						foundPostUpdateGeneratedValues = foundPostUpdateGeneratedValues
-								|| generator instanceof OnExecutionGenerator;
-						foundPreUpdateGeneratedValues = foundPreUpdateGeneratedValues
+						foundPostUpdateGeneratedValues = foundPostInsertGeneratedValues
+								|| generatedOnExecution;
+						foundPreUpdateGeneratedValues = foundPreInsertGeneratedValues
+								|| !generatedOnExecution
 								|| generator instanceof BeforeExecutionGenerator;
 					}
 					else if ( !allowMutation ) {

Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,9 @@ public EntityMetamodel(`
`354`	`354`	`propertyInsertability[i] = writePropertyValue( (OnExecutionGenerator) generator );`
`355`	`355`	`}`
`356`	`356`	`foundPostInsertGeneratedValues = foundPostInsertGeneratedValues`
`357`		`- \|\| generator instanceof OnExecutionGenerator;`
	`357`	`+ \|\| generatedOnExecution;`
`358`	`358`	`foundPreInsertGeneratedValues = foundPreInsertGeneratedValues`
	`359`	`+ \|\| !generatedOnExecution`
`359`	`360`	`\|\| generator instanceof BeforeExecutionGenerator;`
`360`	`361`	`}`
`361`	`362`	`else if ( !allowMutation ) {`
`@@ -365,9 +366,10 @@ else if ( !allowMutation ) {`
`365`	`366`	`if ( generatedOnExecution ) {`
`366`	`367`	`propertyUpdateability[i] = writePropertyValue( (OnExecutionGenerator) generator );`
`367`	`368`	`}`
`368`		`- foundPostUpdateGeneratedValues = foundPostUpdateGeneratedValues`
`369`		`- \|\| generator instanceof OnExecutionGenerator;`
`370`		`- foundPreUpdateGeneratedValues = foundPreUpdateGeneratedValues`
	`369`	`+ foundPostUpdateGeneratedValues = foundPostInsertGeneratedValues`
	`370`	`+ \|\| generatedOnExecution;`
	`371`	`+ foundPreUpdateGeneratedValues = foundPreInsertGeneratedValues`
	`372`	`+ \|\| !generatedOnExecution`
`371`	`373`	`\|\| generator instanceof BeforeExecutionGenerator;`
`372`	`374`	`}`
`373`	`375`	`else if ( !allowMutation ) {`