From 7157ff1fec3b715dc52dccf0525683fa6d2e1907 Mon Sep 17 00:00:00 2001 From: Peter Date: Fri, 14 Feb 2020 11:54:51 +0100 Subject: [PATCH] DATAJPA-1679 - Support distinct and subqueries with projections. Original pull request: #414. --- .../springframework/data/jpa/repository/query/QueryUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java index f5b655967..609833103 100644 --- a/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java +++ b/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java @@ -80,6 +80,7 @@ import org.springframework.util.StringUtils; * @author Grégoire Druant * @author Mohammad Hewedy * @author Andriy Redko + * @author Peter Großmann */ public abstract class QueryUtils { @@ -103,7 +104,7 @@ public abstract class QueryUtils { private static final Pattern ALIAS_MATCH; private static final Pattern COUNT_MATCH; - private static final Pattern PROJECTION_CLAUSE = Pattern.compile("select\\s+(.+)\\s+from", Pattern.CASE_INSENSITIVE); + private static final Pattern PROJECTION_CLAUSE = Pattern.compile("select\\s+(?:distinct\\s+)?(.+?)\\s+from", Pattern.CASE_INSENSITIVE); private static final Pattern NO_DIGITS = Pattern.compile("\\D+");