HHH-19336 - Proper implementation for JPA extended locking scope

HHH-19459 - LockScope, FollowOnLocking

Author: sebersole

hibernate-core/src/main/java/org/hibernate/LockOptions.java

@@ -417,10 +417,14 @@ public Boolean getFollowOnLocking() {
 	 */
 	@Deprecated(since = "7.1")
 	public LockOptions setFollowOnLocking(Boolean followOnLocking) {
-		if ( followOnLocking != null ) {
-			this.followOnStrategy = followOnLocking == Boolean.FALSE
-					? Locking.FollowOn.DISALLOW
-					: Locking.FollowOn.FORCE;
+		if ( followOnLocking == null ) {
+			this.followOnStrategy = Locking.FollowOn.ALLOW;
+		}
+		else {
+			this.followOnStrategy = followOnLocking
+					? Locking.FollowOn.FORCE
+					// todo : DISALLOW or IGNORE?
+					: Locking.FollowOn.IGNORE;
 		}
 		return this;
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/locking/scope/BaselineTests.java

@@ -6,6 +6,7 @@
 
 import jakarta.persistence.LockModeType;
 import org.hibernate.Hibernate;
+import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.dialect.RowLockStrategy;
 import org.hibernate.dialect.lock.PessimisticLockStyle;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
@@ -15,6 +16,7 @@
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.transaction.TransactionUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -69,6 +71,7 @@ void testFindWithLocking(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
 	void testQueryJoiningTagsWithLocking(SessionFactoryScope factoryScope) {
 		// NOTE: roughly the same expectations as #testFindWithExtendedLocking,
 		//		but here the `book_tags` table should also get locked

hibernate-core/src/test/java/org/hibernate/orm/test/locking/scope/ExtendedLockingTests.java

@@ -8,13 +8,15 @@
 import jakarta.persistence.PessimisticLockScope;
 import org.hibernate.Hibernate;
 import org.hibernate.Locking;
+import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.transaction.TransactionUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -76,6 +78,7 @@ void testFindWithExtendedLocking(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
 	void testQueryJoiningTagsWithExtendedLocking(SessionFactoryScope factoryScope) {
 		// NOTE: roughly the same expectations as #testFindWithExtendedLocking,
 		//		but here the `book_tags` table should also get locked

hibernate-core/src/test/java/org/hibernate/orm/test/locking/scope/FetchLockingTests.java

@@ -7,13 +7,15 @@
 import jakarta.persistence.LockModeType;
 import org.hibernate.Hibernate;
 import org.hibernate.Locking;
+import org.hibernate.dialect.HSQLDialect;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.hibernate.testing.orm.transaction.TransactionUtil;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -69,6 +71,7 @@ void testFindWithFetchLocking(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
+	@SkipForDialect(dialectClass = HSQLDialect.class, reason = "See https://sourceforge.net/p/hsqldb/bugs/1734/")
 	void testQueryJoiningTagsWithFetchLocking(SessionFactoryScope factoryScope) {
 		final SQLStatementInspector sqlCollector = factoryScope.getCollectingStatementInspector();
 

hibernate-core/src/test/java/org/hibernate/orm/test/locking/scope/Helper.java

@@ -136,6 +136,7 @@ else if ( rowLockStrategy == RowLockStrategy.COLUMN_NAME ) {
 				aliases = buffer.toString();
 			}
 			else {
+				assert rowLockStrategy == RowLockStrategy.COLUMN;
 				final StringBuilder buffer = new StringBuilder();
 				boolean firstPass = true;
 				for ( Table table : tablesFetched ) {