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

mbellade · mbellade · commit 69544015ec32 · 2025-10-10T09:15:21.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
@@ -310,8 +310,9 @@ public EntityMetamodel(
 							propertyInsertability[i] = writePropertyValue( (OnExecutionGenerator) generator );
 						}
 						foundPostInsertGeneratedValues = foundPostInsertGeneratedValues
-								|| generator instanceof OnExecutionGenerator;
+								|| generatedOnExecution;
 						foundPreInsertGeneratedValues = foundPreInsertGeneratedValues
+								|| !generatedOnExecution
 								|| generator instanceof BeforeExecutionGenerator;
 					}
 					else if ( !allowMutation ) {
@@ -321,9 +322,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
`@@ -310,8 +310,9 @@ public EntityMetamodel(`
`310`	`310`	`propertyInsertability[i] = writePropertyValue( (OnExecutionGenerator) generator );`
`311`	`311`	`}`
`312`	`312`	`foundPostInsertGeneratedValues = foundPostInsertGeneratedValues`
`313`		`- \|\| generator instanceof OnExecutionGenerator;`
	`313`	`+ \|\| generatedOnExecution;`
`314`	`314`	`foundPreInsertGeneratedValues = foundPreInsertGeneratedValues`
	`315`	`+ \|\| !generatedOnExecution`
`315`	`316`	`\|\| generator instanceof BeforeExecutionGenerator;`
`316`	`317`	`}`
`317`	`318`	`else if ( !allowMutation ) {`
`@@ -321,9 +322,10 @@ else if ( !allowMutation ) {`
`321`	`322`	`if ( generatedOnExecution ) {`
`322`	`323`	`propertyUpdateability[i] = writePropertyValue( (OnExecutionGenerator) generator );`
`323`	`324`	`}`
`324`		`- foundPostUpdateGeneratedValues = foundPostUpdateGeneratedValues`
`325`		`- \|\| generator instanceof OnExecutionGenerator;`
`326`		`- foundPreUpdateGeneratedValues = foundPreUpdateGeneratedValues`
	`325`	`+ foundPostUpdateGeneratedValues = foundPostInsertGeneratedValues`
	`326`	`+ \|\| generatedOnExecution;`
	`327`	`+ foundPreUpdateGeneratedValues = foundPreInsertGeneratedValues`
	`328`	`+ \|\| !generatedOnExecution`
`327`	`329`	`\|\| generator instanceof BeforeExecutionGenerator;`
`328`	`330`	`}`
`329`	`331`	`else if ( !allowMutation ) {`