Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ROUND doesn't need to be a reserved word.

Browse Source 
Because ROUND is a reserved word yet is NOT on the list of approved functions, it fails to get parsed. Simply dropping it from the list of reserved words makes it succeed in the HQL query parser.

See #2964
Original Pull Request: #2966
This commit is contained in:
Greg L. Turnquist
2023-05-22 15:20:10 -05:00
parent da37737c22
commit 1c7a19a054
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -977,7 +977,6 @@ RANGE : R A N G E;
RESPECT : R E S P E C T;
RIGHT : R I G H T;
ROLLUP : R O L L U P;
ROUND : R O U N D;
ROW : R O W;
ROWS : R O W S;
SEARCH : S E A R C H;

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

@@ -1448,13 +1448,26 @@ class HqlQueryRendererTests {
assertThatNoException().isThrownBy(() -> {
parseWithoutChanges("""
select a,
case
when a.geaendertAm is null then a.erstelltAm
else a.geaendertAm end as mutationAm
from Element a
where a.erstelltDurch = :variable
order by mutationAm desc nulls last
select a,
case
when a.geaendertAm is null then a.erstelltAm
else a.geaendertAm end as mutationAm
from Element a
where a.erstelltDurch = :variable
order by mutationAm desc nulls last
""");
});
}
@Test // GH-2964
void roundFunctionShouldWorkLikeAnyOtherFunction() {
assertThatNoException().isThrownBy(() -> {
parseWithoutChanges("""
select round(count(ri) * 100 / max(ri.receipt.positions), 0) as perc
from StockOrderItem oi
right join StockReceiptItem ri
on ri.article = oi.article
""");
});
}