DATAJPA-1000 - Fixed alias detection for fetch joins.

We now ignore potentially defined fetch expressions in joins when detecting aliases inside joins.

Author: odrotbohm

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

@@ -88,7 +88,7 @@ public abstract class QueryUtils {
 	private static final String IDENTIFIER = "[\\p{Lu}\\P{InBASIC_LATIN}\\p{Alnum}._$]+";
 	private static final String IDENTIFIER_GROUP = String.format("(%s)", IDENTIFIER);
 
-	private static final String JOIN = "join\\s" + IDENTIFIER + "\\s(as\\s)?" + IDENTIFIER_GROUP;
+	private static final String JOIN = "join\\s+(fetch\\s+)?" + IDENTIFIER + "\\s+(as\\s+)?" + IDENTIFIER_GROUP;
 	private static final Pattern JOIN_PATTERN = Pattern.compile(JOIN, Pattern.CASE_INSENSITIVE);
 
 	private static final String EQUALS_CONDITION_STRING = "%s.%s = :%s";
@@ -101,7 +101,7 @@ public abstract class QueryUtils {
 
 	private static final Map<PersistentAttributeType, Class<? extends Annotation>> ASSOCIATION_TYPES;
 
-	private static final int QUERY_JOIN_ALIAS_GROUP_INDEX = 2;
+	private static final int QUERY_JOIN_ALIAS_GROUP_INDEX = 3;
 	private static final int VARIABLE_NAME_GROUP_INDEX = 4;
 
 	private static final Pattern PUNCTATION_PATTERN = Pattern.compile(".*((?![\\._])[\\p{Punct}|\\s])");

src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java

@@ -501,6 +501,18 @@ public void doesNotPrefixAliasedFunctionCallNameWhenQueryStringContainsMultipleW
 		assertThat(applySorting(query, sort, "m"), endsWith("order by avgPrice asc"));
 	}
 
+	/**
+	 * @see DATAJPA-1000
+	 */
+	@Test
+	public void discoversCorrectAliasForJoinFetch() {
+
+		Set<String> aliases = QueryUtils
+				.getOuterJoinAliases("SELECT DISTINCT user FROM User user LEFT JOIN FETCH user.authorities AS authority");
+
+		assertThat(aliases, contains("authority"));
+	}
+
 	private static void assertCountQuery(String originalQuery, String countQuery) {
 		assertThat(createCountQueryFor(originalQuery), is(countQuery));
 	}