HHH-19336 - Proper implementation for JPA extended locking scope

HHH-19459 - LockScope, FollowOnLocking

Author: sebersole

hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java

@@ -59,7 +59,6 @@
 import static org.hibernate.id.enhanced.OptimizerFactory.determineImplicitOptimizerName;
 import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.internal.util.StringHelper.isNotEmpty;
-import static org.hibernate.internal.util.StringHelper.qualify;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getBoolean;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getInt;
 import static org.hibernate.internal.util.config.ConfigurationHelper.getString;
@@ -492,11 +491,10 @@ protected int determineIncrementSize(Properties params) {
 
 	protected String buildSelectQuery(String formattedPhysicalTableName, SqlStringGenerationContext context) {
 		final LockOptions lockOptions = new LockOptions( LockMode.PESSIMISTIC_WRITE );
-		final String alias = "tbl";
 		final SimpleSelect select = new SimpleSelect( context.getDialect() )
-				.addColumn( qualify( alias, valueColumnName ) )
-				.setTableName( formattedPhysicalTableName, alias )
-				.addRestriction( qualify( alias, segmentColumnName ) )
+				.addColumn( valueColumnName )
+				.setTableName( formattedPhysicalTableName )
+				.addRestriction( segmentColumnName )
 				.setLockOptions( lockOptions );
 		return select.toStatementString();
 	}

hibernate-core/src/main/java/org/hibernate/sql/SimpleSelect.java

@@ -4,23 +4,22 @@
  */
 package org.hibernate.sql;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.hibernate.Internal;
 import org.hibernate.LockMode;
 import org.hibernate.LockOptions;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.sql.ast.internal.ParameterMarkerStrategyStandard;
 import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * A SQL {@code SELECT} statement with no table joins.
  *
@@ -29,7 +28,6 @@
 @Internal
 public class SimpleSelect implements RestrictionRenderingContext {
 	protected String tableName;
-	protected String tableAlias;
 	protected String orderBy;
 	protected String comment;
 
@@ -67,15 +65,7 @@ public String makeParameterMarker() {
 	 * Sets the name of the table we are selecting from
 	 */
 	public SimpleSelect setTableName(String tableName) {
-		return setTableName( tableName, null );
-	}
-
-	/**
-	 * Sets the name of the table we are selecting from
-	 */
-	public SimpleSelect setTableName(String tableName, String tableAlias) {
 		this.tableName = tableName;
-		this.tableAlias = tableAlias;
 		return this;
 	}
 
@@ -225,9 +215,6 @@ private void applySelectClause(StringBuilder buf) {
 
 	private void applyFromClause(StringBuilder buf) {
 		buf.append( " from " ).append( dialect.appendLockHint( lockOptions, tableName ) );
-		if ( StringHelper.isNotEmpty( tableAlias ) ) {
-			buf.append( " as " ).append( tableAlias );
-		}
 	}
 
 	private void applyWhereClause(StringBuilder buf) {