HHH-19336 - Proper implementation for JPA extended locking scope

sebersole · sebersole · commit cebd48c3f935 · 2025-05-25T09:02:09.000-05:00
HHH-19459 - LockScope, FollowOnLocking
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -1716,6 +1716,10 @@ protected LockStrategy determineLockingStrategy(
 			return LockStrategy.FOLLOW_ON;
 		}
 
+		if ( !querySpec.isRoot() ) {
+			followOnStrategy = Locking.FollowOn.ALLOW;
+		}
+
 		LockStrategy strategy = LockStrategy.CLAUSE;
 
 		if ( !querySpec.getGroupByClauseExpressions().isEmpty() ) {

Original file line number	Diff line number	Diff line change
`@@ -1716,6 +1716,10 @@ protected LockStrategy determineLockingStrategy(`
`1716`	`1716`	`return LockStrategy.FOLLOW_ON;`
`1717`	`1717`	`}`
`1718`	`1718`
	`1719`	`+ if ( !querySpec.isRoot() ) {`
	`1720`	`+ followOnStrategy = Locking.FollowOn.ALLOW;`
	`1721`	`+ }`
	`1722`	`+`
`1719`	`1723`	`LockStrategy strategy = LockStrategy.CLAUSE;`
`1720`	`1724`
`1721`	`1725`	`if ( !querySpec.getGroupByClauseExpressions().isEmpty() ) {`