From 261d693d8b0d6691c01ca485181ee6a5f37afa9b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 12 Jun 2025 08:31:35 +0200 Subject: [PATCH] Polishing. Simplify regex. See #3911 --- .../data/jpa/repository/query/QueryUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java index 5de51a2f9..f69363774 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java @@ -193,15 +193,15 @@ public abstract class QueryUtils { // any function call including parameters within the brackets builder.append("\\w+\\s*\\([\\w\\.,\\s'=:;\\\\?]+\\)"); // the potential alias - builder.append("\\s+(?:as|AS)+\\s+([\\w\\.]+)"); + builder.append("\\s+(?:as)+\\s+([\\w\\.]+)"); - FUNCTION_PATTERN = compile(builder.toString()); + FUNCTION_PATTERN = compile(builder.toString(), CASE_INSENSITIVE); builder = new StringBuilder(); builder.append("[^\\s\\(\\)]+"); // No white char no bracket builder.append("\\s+(?:as)+\\s+([\\w\\.]+)"); // the potential alias - FIELD_ALIAS_PATTERN = compile(builder.toString()); + FIELD_ALIAS_PATTERN = compile(builder.toString(), CASE_INSENSITIVE); } /**