HHH-12076 Fix index out of bounds exception and allow table group joins for collection joins as well

Author: randymay

hibernate-core/src/main/java/org/hibernate/engine/internal/JoinSequence.java

@@ -14,6 +14,7 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.hql.internal.ast.tree.ImpliedFromElement;
 import org.hibernate.internal.util.StringHelper;
+import org.hibernate.persister.collection.AbstractCollectionPersister;
 import org.hibernate.persister.collection.QueryableCollection;
 import org.hibernate.persister.entity.AbstractEntityPersister;
 import org.hibernate.persister.entity.Joinable;
@@ -422,9 +423,16 @@ private boolean needsTableGroupJoin(List<Join> joins, String withClauseFragment)
 	}
 
 	private boolean isSubclassAliasDereferenced(Join join, String withClauseFragment) {
-		if ( join.getJoinable() instanceof AbstractEntityPersister ) {
-			AbstractEntityPersister persister = (AbstractEntityPersister) join.getJoinable();
-			int subclassTableSpan = persister.getSubclassTableSpan();
+		Object joinable = join.getJoinable();
+		if ( joinable instanceof AbstractCollectionPersister ) {
+			final AbstractCollectionPersister collectionPersister = (AbstractCollectionPersister) joinable;
+			if ( collectionPersister.getElementType().isEntityType() ) {
+				joinable = ( collectionPersister ).getElementPersister();
+			}
+		}
+		if ( joinable instanceof AbstractEntityPersister ) {
+			final AbstractEntityPersister persister = (AbstractEntityPersister) joinable;
+			final int subclassTableSpan = persister.getSubclassTableSpan();
 			for ( int j = 1; j < subclassTableSpan; j++ ) {
 				String subclassAlias = AbstractEntityPersister.generateTableAlias( join.getAlias(), j );
 				if ( isAliasDereferenced( withClauseFragment, subclassAlias ) ) {

hibernate-core/src/main/java/org/hibernate/hql/internal/ast/HqlSqlWalker.java

@@ -557,7 +557,9 @@ public void visit(AST node) {
 				}
 				else {
 					referencedFromElement = fromElement;
-					joinAlias = extractAppliedAlias( dotNode );
+					if ( fromElement != null ) {
+						joinAlias = extractAppliedAlias( dotNode );
+					}
 					// TODO : temporary
 					//      needed because currently persister is the one that
 					// creates and renders the join fragments for inheritance

hibernate-core/src/test/java/org/hibernate/query/hhh12076/HbmMappingJoinClassTest.java

@@ -80,7 +80,6 @@ protected void prepareTest() {
 	}
 
 	@Test
-	@FailureExpected( jiraKey = "HHH-12076")
 	public void testClassExpressionInOnClause() {
 		doInHibernate( this::sessionFactory, session -> {
 			List<SettlementTask> results = session.createQuery(