HHH-17407 Fix navigable path assertion for correlated entity joins

hibernate · Dec 1, 2023 · eab28b3 · eab28b3
1 parent 6ee5f11
commit eab28b3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/domain/AbstractSqmPath.java
@@ -72,6 +72,7 @@ protected void copyTo(AbstractSqmPath<T> target, SqmCopyContext context) {
 
 	// meant for assertions only
 	private boolean navigablePathsMatch(AbstractSqmPath<T> target) {
+		final SqmPath<?> lhs = getLhs() != null ? getLhs() : findRoot();
 		final SqmPath<?> targetLhs = target.getLhs() != null ? target.getLhs() : target.findRoot();
 		return lhs == null || lhs.getNavigablePath() == targetLhs.getNavigablePath()
 				|| getRoot( lhs ).getNodeType() instanceof SqmPolymorphicRootDescriptor;