HHH-19336 - Proper implementation for JPA extended locking scope

HHH-19459 - LockScope, FollowOnLocking

Author: sebersole

hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/OracleSqlAstTranslator.java

@@ -169,7 +169,7 @@ protected LockStrategy determineLockingStrategy(
 			if ( followOnStrategy == Locking.FollowOn.DISALLOW ) {
 				throw new IllegalQueryOperationException( "Locking with set operators is not supported" );
 			}
-			else if ( followOnStrategy != Locking.FollowOn.IGNORE ) {
+			else if ( followOnStrategy == Locking.FollowOn.IGNORE ) {
 				strategy = LockStrategy.NONE;
 			}
 			else {
@@ -181,7 +181,7 @@ else if ( followOnStrategy != Locking.FollowOn.IGNORE ) {
 			if ( followOnStrategy == Locking.FollowOn.DISALLOW ) {
 				throw new IllegalQueryOperationException( "Locking with set operators is not supported" );
 			}
-			else if ( followOnStrategy != Locking.FollowOn.IGNORE ) {
+			else if ( followOnStrategy == Locking.FollowOn.IGNORE ) {
 				strategy = LockStrategy.NONE;
 			}
 			else {
@@ -193,7 +193,7 @@ else if ( followOnStrategy != Locking.FollowOn.IGNORE ) {
 			if ( followOnStrategy == Locking.FollowOn.DISALLOW ) {
 				throw new IllegalQueryOperationException( "Locking with OFFSET/FETCH is not supported" );
 			}
-			else if ( followOnStrategy != Locking.FollowOn.IGNORE ) {
+			else if ( followOnStrategy == Locking.FollowOn.IGNORE ) {
 				strategy = LockStrategy.NONE;
 			}
 			else {

hibernate-core/src/main/java/org/hibernate/sql/ast/internal/StandardForUpdateClauseStrategy.java

@@ -16,7 +16,6 @@
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.internal.BasicValuedCollectionPart;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.ForUpdateClauseStrategy;
 import org.hibernate.sql.ast.spi.SqlAppender;
@@ -113,9 +112,11 @@ private void trackJoin(TableGroupJoin join) {
 	@Override
 	public boolean containsOuterJoins() {
 		for ( TableGroup tableGroup : rootsToLock ) {
-			if ( tableGroup.getModelPart() instanceof JoinedSubclassEntityPersister ) {
-				// inherently has outer joins
-				return true;
+			if ( tableGroup.getModelPart() instanceof EntityPersister entityMapping ) {
+				if ( entityMapping.hasMultipleTables() ) {
+					// joined inheritance and/or secondary tables - inherently has outer joins
+					return true;
+				}
 			}
 		}
 
@@ -129,9 +130,11 @@ public boolean containsOuterJoins() {
 				&& !joinedGroup.isVirtual() ) {
 				return true;
 			}
-			if ( joinedGroup.getModelPart() instanceof JoinedSubclassEntityPersister ) {
-				// inherently has outer joins
-				return true;
+			if ( joinedGroup.getModelPart() instanceof EntityPersister entityMapping ) {
+				if ( entityMapping.hasMultipleTables() ) {
+					// joined inheritance and/or secondary tables - inherently has outer joins
+					return true;
+				}
 			}
 		}