From 34e2331190872123d45dff4249e43e4cc294bdb5 Mon Sep 17 00:00:00 2001 From: "Greg L. Turnquist" Date: Wed, 2 Aug 2023 13:41:19 -0500 Subject: [PATCH] FROM and DATE should be usable as parameters in JPQL queries. See #3092 --- .../org/springframework/data/jpa/repository/query/Jpql.g4 | 2 ++ .../data/jpa/repository/query/JpqlQueryRendererTests.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4 b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4 index e17a919f4..4a23f4c14 100644 --- a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4 +++ b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4 @@ -597,6 +597,8 @@ trim_character identification_variable : IDENTIFICATION_VARIABLE | f=(COUNT + | DATE + | FROM | INNER | KEY | LEFT 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 368b1379a..bc0938c50 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 @@ -953,4 +953,9 @@ class JpqlQueryRendererTests { void alternateNotEqualsOperatorShouldWork() { assertQuery("select e from Employee e where e.firstName != :name"); } + + @Test // GH-3092 + void dateAndFromShouldBeValidNames() { + assertQuery("SELECT e FROM Entity e WHERE e.embeddedId.date BETWEEN :from AND :to"); + } }