BaseSqmToSqlAstConverter#consumeEntityJoin() postpone tableGroupJoin.…

…applyPredicate after consuming implicit joins
hibernate · Mar 10, 2021 · 15b5246 · 15b5246
1 parent 1905e8b
commit 15b5246
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java
@@ -1841,15 +1841,16 @@ private void consumeEntityJoin(SqmEntityJoin sqmJoin, TableGroup lhsTableGroup)
 		);
 		lhsTableGroup.addTableGroupJoin( tableGroupJoin );
 
+		consumeExplicitJoins( sqmJoin, tableGroupJoin.getJoinedGroup() );
+		consumeImplicitJoins( sqmJoin, tableGroupJoin.getJoinedGroup() );
+
 		// add any additional join restrictions
 		if ( sqmJoin.getJoinPredicate() != null ) {
 			tableGroupJoin.applyPredicate(
 					(Predicate) sqmJoin.getJoinPredicate().accept( this )
 			);
 		}
 
-		consumeExplicitJoins( sqmJoin, tableGroupJoin.getJoinedGroup() );
-		consumeImplicitJoins( sqmJoin, tableGroupJoin.getJoinedGroup() );
 	}
 
 	private void consumeImplicitJoins(SqmPath<?> sqmPath, TableGroup tableGroup) {