check attribute type for association

Author: christophstrobl

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/JpqlUtils.java

@@ -89,15 +89,17 @@ public JpqlQueryBuilder.PathExpression toExpressionRecursively(Metamodel metamod
 
 				// except its a collection type on the root
 				if (from instanceof EntityType<?> && property.isCollection()) {
-					return new JpqlQueryBuilder.PathAndOrigin(property, source, false);
+					Attribute<?, ?> nextAttribute = resolveAttribute(metamodel, from, property);
+					if(nextAttribute != null && nextAttribute.isAssociation()) {
+						return new JpqlQueryBuilder.PathAndOrigin(property, source, false);
+					}
 				}
 				return new JpqlQueryBuilder.PathAndOrigin(property, joinSource, true);
 			}
 
 			PropertyPath nextProperty = Objects.requireNonNull(property.next(), "An element of the property path is null");
 
-			ManagedType<?> managedTypeForModel = getManagedTypeForModel(from);
-			Attribute<?, ?> nextAttribute = getModelForPath(metamodel, property, managedTypeForModel, from);
+			Attribute<?, ?> nextAttribute = resolveAttribute(metamodel, from, property);
 
 			if (nextAttribute == null) {
 				throw new IllegalStateException("Binding property is null");
@@ -112,6 +114,13 @@ public JpqlQueryBuilder.PathExpression toExpressionRecursively(Metamodel metamod
 					requiresOuterJoin);
 		}
 
+		private static @Nullable Attribute<?, ?> resolveAttribute(Metamodel metamodel, Bindable<?> from,
+				PropertyPath property) {
+
+			ManagedType<?> managedType = getManagedTypeForModel(from);
+			return getModelForPath(metamodel, property, managedType, from);
+		}
+
 		private static @Nullable Attribute<?, ?> getModelForPath(@Nullable Metamodel metamodel, PropertyPath path,
 				@Nullable ManagedType<?> managedType, @Nullable Bindable<?> fallback) {
 
@@ -148,8 +157,7 @@ record BindablePathResolver(Metamodel metamodel,
 			}
 
 			private @Nullable Attribute<?, ?> resolveAttribute(PropertyPath propertyPath) {
-				ManagedType<?> managedType = getManagedTypeForModel(bindable);
-				return getModelForPath(metamodel, propertyPath, managedType, bindable);
+				return JpqlExpressionFactory.resolveAttribute(metamodel, bindable, propertyPath);
 			}
 
 			@Override

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/EclipseLinkUserRepositoryFinderTests.java

@@ -40,4 +40,8 @@ void executesInKeywordForPageCorrectly() {}
 	@Override
 	void shouldProjectWithKeysetScrolling() {}
 
+	@Disabled
+	@Override
+	void executesQueryWithContainingOnCollectionViaJoin() {}
+
 }