pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>3.4.3</version>
+	<version>3.4.4</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>
@@ -23,16 +23,16 @@
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.4.3</version>
+		<version>3.4.4</version>
 	</parent>
 
 	<properties>
 		<antlr>4.13.0</antlr> <!-- align with Hibernate's parser -->
 		<eclipselink>4.0.5</eclipselink>
 		<eclipselink-next>4.0.6-SNAPSHOT</eclipselink-next>
-		<hibernate>6.6.7.Final</hibernate>
-		<hibernate-62>6.2.32.Final</hibernate-62>
-		<hibernate-66-snapshots>6.6.8-SNAPSHOT</hibernate-66-snapshots>
+		<hibernate>6.6.10.Final</hibernate>
+		<hibernate-62>6.2.33.Final</hibernate-62>
+		<hibernate-66-snapshots>6.6.11-SNAPSHOT</hibernate-66-snapshots>
 		<hibernate-70>7.0.0.Beta1</hibernate-70>
 		<hibernate-70-snapshots>7.0.0-SNAPSHOT</hibernate-70-snapshots>
 		<hsqldb>2.7.4</hsqldb>
@@ -41,7 +41,7 @@
 		<jsqlparser>5.0</jsqlparser>
 		<mysql-connector-java>9.1.0</mysql-connector-java>
 		<postgresql>42.7.4</postgresql>
-		<springdata.commons>3.4.3</springdata.commons>
+		<springdata.commons>3.4.4</springdata.commons>
 		<vavr>0.10.3</vavr>
 
 		<hibernate.groupId>org.hibernate</hibernate.groupId>

spring-data-envers/pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>3.4.3</version>
+	<version>3.4.4</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.4.3</version>
+		<version>3.4.4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.4.3</version>
+		<version>3.4.4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
-	<version>3.4.3</version>
+	<version>3.4.4</version>
 
 	<name>Spring Data JPA</name>
 	<description>Spring Data module for JPA repositories.</description>
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.4.3</version>
+		<version>3.4.4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilder.java

@@ -18,6 +18,7 @@
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
@@ -35,6 +36,7 @@
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.data.domain.ExampleMatcher.MatchMode;
 import org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer;
 import org.springframework.data.jpa.repository.query.EscapeCharacter;
 import org.springframework.data.support.ExampleMatcherAccessor;
@@ -57,6 +59,7 @@
  * @author Oliver Gierke
  * @author Jens Schauder
  * @author Greg Turnquist
+ * @author Arnaud Lecointre
  * @since 1.10
  */
 public class QueryByExamplePredicateBuilder {
@@ -103,8 +106,8 @@ public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Examp
 		ExampleMatcher matcher = example.getMatcher();
 
 		List<Predicate> predicates = getPredicates("", cb, root, root.getModel(), example.getProbe(),
-				example.getProbeType(), new ExampleMatcherAccessor(matcher), new PathNode("root", null, example.getProbe()),
-				escapeCharacter);
+				example.getProbeType(), matcher.getMatchMode(), new ExampleMatcherAccessor(matcher),
+				new PathNode("root", null, example.getProbe()), escapeCharacter);
 
 		if (predicates.isEmpty()) {
 			return null;
@@ -121,7 +124,7 @@ public static <T> Predicate getPredicate(Root<T> root, CriteriaBuilder cb, Examp
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> from, ManagedType<?> type, Object value,
-			Class<?> probeType, ExampleMatcherAccessor exampleAccessor, PathNode currentNode,
+			Class<?> probeType, MatchMode matchMode, ExampleMatcherAccessor exampleAccessor, PathNode currentNode,
 			EscapeCharacter escapeCharacter) {
 
 		List<Predicate> predicates = new ArrayList<>();
@@ -158,7 +161,7 @@ static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> fr
 
 				predicates
 						.addAll(getPredicates(currentPath, cb, from.get(attribute.getName()), (ManagedType<?>) attribute.getType(),
-								attributeValue, probeType, exampleAccessor, currentNode, escapeCharacter));
+								attributeValue, probeType, matchMode, exampleAccessor, currentNode, escapeCharacter));
 				continue;
 			}
 
@@ -171,8 +174,10 @@ static List<Predicate> getPredicates(String path, CriteriaBuilder cb, Path<?> fr
 									ClassUtils.getShortName(probeType), node));
 				}
 
-				predicates.addAll(getPredicates(currentPath, cb, ((From<?, ?>) from).join(attribute.getName()),
-						(ManagedType<?>) attribute.getType(), attributeValue, probeType, exampleAccessor, node, escapeCharacter));
+				JoinType joinType = matchMode.equals(MatchMode.ALL) ? JoinType.INNER : JoinType.LEFT;
+				predicates.addAll(getPredicates(currentPath, cb, ((From<?, ?>) from).join(attribute.getName(), joinType),
+						(ManagedType<?>) attribute.getType(), attributeValue, probeType, matchMode, exampleAccessor, node,
+						escapeCharacter));
 
 				continue;
 			}

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

@@ -100,8 +100,13 @@ public QueryRendererBuilder visitFromQuery(HqlParser.FromQueryContext ctx) {
 
 		if (ctx.fromClause() != null) {
 			builder.appendExpression(visit(ctx.fromClause()));
+			if(primaryFromAlias == null) {
+				builder.append(TOKEN_AS);
+				builder.append(TOKEN_DOUBLE_UNDERSCORE);
+			}
 		}
 
+
 		if (ctx.whereClause() != null) {
 			builder.appendExpression(visit(ctx.whereClause()));
 		}

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

@@ -156,6 +156,10 @@ public Object prepare(@Nullable Object valueToBind) {
 	 */
 	public boolean bindsTo(ParameterBinding other) {
 
+		if (getIdentifier().equals(other.getIdentifier())) {
+			return true;
+		}
+
 		if (identifier.hasName() && other.identifier.hasName()) {
 			if (identifier.getName().equals(other.identifier.getName())) {
 				return true;
@@ -503,6 +507,16 @@ static Expression ofExpression(ValueExpression expression) {
 			return new Expression(expression);
 		}
 
+		/**
+		 * Creates a {@link MethodInvocationArgument} object for {@code name}
+		 *
+		 * @param name the parameter name from the method invocation.
+		 * @return {@link MethodInvocationArgument} object for {@code name}.
+		 */
+		static MethodInvocationArgument ofParameter(String name) {
+			return ofParameter(name, null);
+		}
+
 		/**
 		 * Creates a {@link MethodInvocationArgument} object for {@code name} and {@code position}. Either the name or the
 		 * position must be given.

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

@@ -889,7 +889,7 @@ private static <T> T getAnnotationProperty(Attribute<?, ?> attribute, String pro
 	}
 
 	/**
-	 * Returns an existing join for the given attribute if one already exists or creates a new one if not.
+	 * Returns an existing (fetch) join for the given attribute if one already exists or creates a new one if not.
 	 *
 	 * @param from the {@link From} to get the current joins from.
 	 * @param attribute the {@link Attribute} to look for in the current joins.
@@ -898,6 +898,13 @@ private static <T> T getAnnotationProperty(Attribute<?, ?> attribute, String pro
 	 */
 	private static Join<?, ?> getOrCreateJoin(From<?, ?> from, String attribute, JoinType joinType) {
 
+		for (Fetch<?, ?> fetch : from.getFetches()) {
+
+			if (fetch instanceof Join<?, ?> join && join.getAttribute().getName().equals(attribute)) {
+				return join;
+			}
+		}
+
 		for (Join<?, ?> join : from.getJoins()) {
 
 			if (join.getAttribute().getName().equals(attribute)) {

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

@@ -23,6 +23,7 @@
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -141,8 +142,12 @@ public DeclaredQuery deriveCountQuery(@Nullable String countQueryProjection) {
 
 						for (ParameterBinding binding : bindings) {
 
-							if (binding.getOrigin().isExpression() && derivedBindings.removeIf(
-									it -> !it.getOrigin().isExpression() && it.getIdentifier().equals(binding.getIdentifier()))) {
+							Predicate<ParameterBinding> identifier = binding::bindsTo;
+				Predicate<ParameterBinding> notCompatible = Predicate.not(binding::isCompatibleWith);
+
+				// replace incompatible bindings
+				if ( derivedBindings.removeIf(
+									it -> identifier.test(it) && notCompatible.test(it))) {
 								derivedBindings.add(binding);
 							}
 						}

spring-data-jpa/src/test/java/org/springframework/data/jpa/convert/QueryByExamplePredicateBuilderUnitTests.java

@@ -16,13 +16,15 @@
 package org.springframework.data.jpa.convert;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.domain.Example.*;
 
 import jakarta.persistence.Id;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
@@ -39,6 +41,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
@@ -47,6 +51,7 @@
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher;
+import org.springframework.data.domain.ExampleMatcher.MatchMode;
 import org.springframework.data.jpa.repository.query.EscapeCharacter;
 import org.springframework.util.ObjectUtils;
 
@@ -57,6 +62,7 @@
  * @author Mark Paluch
  * @author Oliver Gierke
  * @author Jens Schauder
+ * @author Arnaud Lecointre
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -271,6 +277,21 @@ void likePatternsGetEscapedEnding() {
 		verify(cb, times(1)).like(any(Expression.class), eq("%f\\\\o\\_o"), eq('\\'));
 	}
 
+	@ParameterizedTest(name = "Matching {0} on association should join using JoinType.{1} ") // GH-3763
+	@CsvSource({ "ALL, INNER", "ANY, LEFT" })
+	void matchingAssociationShouldUseTheCorrectJoinType(MatchMode matchMode, JoinType expectedJoinType) {
+
+		Person person = new Person();
+		person.father = new Person();
+
+		ExampleMatcher matcher = matchMode == MatchMode.ALL ? ExampleMatcher.matchingAll() : ExampleMatcher.matchingAny();
+		Example<Person> example = of(person, matcher);
+
+		QueryByExamplePredicateBuilder.getPredicate(root, cb, example, EscapeCharacter.DEFAULT);
+
+		verify(root, times(1)).join("father", expectedJoinType);
+	}
+
 	@SuppressWarnings("unused")
 	static class Person {