From fd914b7b5ce697539035e330f6afa48b0031afbb Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Mon, 14 Apr 2025 16:48:32 +0200
Subject: [PATCH] Allow HQL HAVING without enforcing GROUP BY.

Closes #3840
---
 .../springframework/data/jpa/repository/query/Hql.g4 |  4 ++--
 .../jpa/repository/query/EqlQueryRendererTests.java  |  8 ++++++++
 .../jpa/repository/query/HqlQueryRendererTests.java  | 12 ++++++++++++
 .../jpa/repository/query/JpqlQueryRendererTests.java |  8 ++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4 b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4
index 54a93e9eb..a7034d862 100644
--- a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4
+++ b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4
@@ -87,8 +87,8 @@ orderedQuery
     ;
 
 query
-    : selectClause fromClause? whereClause? (groupByClause havingClause?)? # SelectQuery
-    | fromClause whereClause? (groupByClause havingClause?)? selectClause? # FromQuery
+    : selectClause fromClause? whereClause? groupByClause? havingClause? # SelectQuery
+    | fromClause whereClause? groupByClause? havingClause? selectClause? # FromQuery
     ;
 
 queryOrder
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EqlQueryRendererTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EqlQueryRendererTests.java
index 9da99a1f9..148362525 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EqlQueryRendererTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EqlQueryRendererTests.java
@@ -603,6 +603,14 @@ class EqlQueryRendererTests {
 				GROUP BY c.country
 				HAVING COUNT(c) > 30
 				""");
+
+		assertQuery("""
+				SELECT COUNT(f)
+				FROM FooEntity f
+				WHERE f.name IN ('Y', 'Basic', 'Remit')
+							AND f.size = 10
+				HAVING COUNT(f) > 0
+				""");
 	}
 
 	@Test
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java
index 5b97963f6..47568fc19 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java
@@ -622,6 +622,18 @@ class HqlQueryRendererTests {
 				""");
 	}
 
+	@Test
+	void shouldRenderHavingWithFunction() {
+
+		assertQuery("""
+				SELECT COUNT(f)
+				FROM FooEntity f
+				WHERE f.name IN ('Y', 'Basic', 'Remit')
+							AND f.size = 10
+				HAVING COUNT(f) > 0
+				""");
+	}
+
 	@Test
 	void theRest8() {
 
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java
index af1ee9b0b..12d254eed 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java
@@ -604,6 +604,14 @@ class JpqlQueryRendererTests {
 				GROUP BY c.country
 				HAVING COUNT(c) > 30
 				""");
+
+		assertQuery("""
+				SELECT COUNT(f)
+				FROM FooEntity f
+				WHERE f.name IN ('Y', 'Basic', 'Remit')
+							AND f.size = 10
+				HAVING COUNT(f) > 0
+				""");
 	}
 
 	@Test