Drop FETCH from JOIN clauses when creating a count query in Hibernate.

Resolves #2348.
Supercedes #2686.

Author: gregturn

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

@@ -265,6 +265,29 @@ public List<JpaQueryParsingToken> visitFromRoot(HqlParser.FromRootContext ctx) {
 		return tokens;
 	}
 
+	@Override
+	public List<JpaQueryParsingToken> visitJoin(HqlParser.JoinContext ctx) {
+
+		List<JpaQueryParsingToken> tokens = new ArrayList<>();
+
+		tokens.addAll(visit(ctx.joinType()));
+		tokens.add(new JpaQueryParsingToken(ctx.JOIN()));
+
+		if (!countQuery) {
+			if (ctx.FETCH() != null) {
+				tokens.add(new JpaQueryParsingToken(ctx.FETCH()));
+			}
+		}
+
+		tokens.addAll(visit(ctx.joinTarget()));
+
+		if (ctx.joinRestriction() != null) {
+			tokens.addAll(visit(ctx.joinRestriction()));
+		}
+
+		return tokens;
+	}
+
 	@Override
 	public List<JpaQueryParsingToken> visitAlias(HqlParser.AliasContext ctx) {
 

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

@@ -793,6 +793,16 @@ void sortProperlyAppendsToExistingOrderByWithFunction() {
 						"select e from SampleEntity e where function('nativeFunc', ?1) > 'testVal' order by function('nativeFunc', ?1), e.age desc");
 	}
 
+	@Test // GH-2348
+	void removeFetchFromJoinsDuringCountQueryCreation() {
+
+		assertCountQuery("select u from User u left outer join fetch u.roles r left outer JOIN   FETCH  u.accounts a",
+				"select count(u) from User u left outer join u.roles r left outer JOIN u.accounts a");
+
+		assertCountQuery("SELECT DISTINCT b FROM Board b LEFT JOIN FETCH b.comments ORDER BY b.id",
+				"SELECT count(DISTINCT b) FROM Board b LEFT JOIN b.comments");
+	}
+
 	private void assertCountQuery(String originalQuery, String countQuery) {
 		assertThat(createCountQueryFor(originalQuery)).isEqualTo(countQuery);
 	}