Allow HQL HAVING without enforcing GROUP BY.

Closes #3840

Author: mp911de

spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4

@@ -89,8 +89,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

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

@@ -624,6 +624,14 @@ SELECT c.country, COUNT(c)
 				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

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

@@ -1144,6 +1144,18 @@ HAVING COUNT(o) >= 5
 				""");
 	}
 
+	@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() {
 

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

@@ -890,6 +890,14 @@ SELECT c.country, COUNT(c)
 				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