HHH-18703 Use natural order table numbers for subclass column closure

Author: beikov

hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java

@@ -127,7 +127,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
 
 	// the closure of all columns used by the entire hierarchy including
 	// subclasses and superclasses of this class
-	private final int[] subclassColumnTableNumberClosure;
+	private final int[] subclassColumnNaturalOrderTableNumberClosure;
 //	private final int[] subclassFormulaTableNumberClosure;
 	private final String[] subclassColumnClosure;
 
@@ -470,11 +470,12 @@ public JoinedSubclassEntityPersister(
 			final String tableName = property.getValue().getTable().
 					getQualifiedName( creationContext.getSqlStringGenerationContext() );
 			final Integer tableNumber = getTableId( tableName, subclassTableNameClosure );
+			final Integer naturalTableNumber = getTableId( tableName, naturalOrderSubclassTableNameClosure );
 			propTableNumbers.add( tableNumber );
 
 			for ( Selectable selectable : property.getSelectables() ) {
 				if ( !selectable.isFormula() ) {
-					columnTableNumbers.add( tableNumber );
+					columnTableNumbers.add( naturalTableNumber );
 					Column column = (Column) selectable;
 					columns.add( column.getQuotedName( dialect ) );
 				}
@@ -484,7 +485,7 @@ public JoinedSubclassEntityPersister(
 			}
 		}
 
-		subclassColumnTableNumberClosure = toIntArray( columnTableNumbers );
+		subclassColumnNaturalOrderTableNumberClosure = toIntArray( columnTableNumbers );
 		subclassPropertyTableNumberClosure = toIntArray( propTableNumbers );
 //		subclassFormulaTableNumberClosure = ArrayHelper.toIntArray( formulaTableNumbers );
 		subclassColumnClosure = toStringArray( columns );
@@ -1069,12 +1070,12 @@ public int determineTableNumberForColumn(String columnName) {
 					&& subclassColumnClosure[i].endsWith( "\"" );
 			if ( quoted ) {
 				if ( subclassColumnClosure[i].equals( columnName ) ) {
-					return subclassColumnTableNumberClosure[i];
+					return subclassColumnNaturalOrderTableNumberClosure[i];
 				}
 			}
 			else {
 				if ( subclassColumnClosure[i].equalsIgnoreCase( columnName ) ) {
-					return subclassColumnTableNumberClosure[i];
+					return subclassColumnNaturalOrderTableNumberClosure[i];
 				}
 			}
 		}