HHH-19336 - Proper implementation for JPA extended locking scope

HHH-19459 - LockScope, FollowOnLocking

Author: sebersole

hibernate-core/src/main/java/org/hibernate/dialect/AbstractTransactSQLDialect.java

@@ -216,7 +216,7 @@ public String appendLockHint(LockOptions lockOptions, String tableName) {
 
 	@Override
 	public String applyLocksToSql(String sql, LockOptions lockOptions, Map<String, String[]> keyColumnNameMap) {
-		if ( lockOptions.getLockMode() == LockMode.NONE ) {
+		if ( lockOptions.getLockMode() == LockMode.NONE || keyColumnNameMap == null ) {
 			return sql;
 		}
 

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

@@ -7,6 +7,7 @@
 import jakarta.persistence.LockModeType;
 import org.hibernate.Hibernate;
 import org.hibernate.dialect.RowLockStrategy;
+import org.hibernate.dialect.lock.PessimisticLockStyle;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
@@ -86,9 +87,11 @@ void testQueryJoiningTagsWithLocking(SessionFactoryScope factoryScope) {
 			Helper.deleteFromTable( factoryScope, "book_authors", false );
 
 			// Whether the `book_tags` table should be locked or not depends on the capability of the db:
+			//		* if the database uses table hints, it will be locked
 			//		* if the database supports for-update-of, it will not be locked since `of` will only reference the root table (`books`)
 			//		* if the database supports for-update (no -of), it will be locked since it locks all returned rows
-			final boolean expectingToBlockTags = session.getDialect().getWriteRowLockStrategy() == RowLockStrategy.NONE;
+			final boolean expectingToBlockTags = session.getDialect().getWriteRowLockStrategy() == RowLockStrategy.NONE
+					|| session.getDialect().getPessimisticLockStyle() == PessimisticLockStyle.TABLE_HINT;
 			Helper.deleteFromTable( factoryScope, "book_tags", expectingToBlockTags );
 
 			// The `books` table should be locked.

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

@@ -138,7 +138,7 @@ else if ( rowLockStrategy == RowLockStrategy.TABLE ) {
 			// Transact SQL (mssql, sybase) "table hint"-style locking
 			final LockOptions lockOptions = new LockOptions( LockMode.PESSIMISTIC_WRITE );
 			for ( Table table : tablesFetched ) {
-				final String booksTableReference = dialect.appendLockHint( lockOptions, table.getTableName() );
+				final String booksTableReference = dialect.appendLockHint( lockOptions, table.getTableAlias() );
 				assertThat( sql ).contains( booksTableReference );
 			}
 		}