Skip to content

Allow whitespace in JPQL and EQL JDBC escape literals. #4294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jewoodev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow whitespace in JPQL and EQL JDBC escape literals. #4294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Eql.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,6 +1030,6 @@ STRINGLITERAL : '\'' (~ ('\'' | '\\')|'\\')* '\'' ;
FLOATLITERAL : ('0' .. '9')* '.' ('0' .. '9')+ (E ('0' .. '9')+)* (F|D)?;
INTLITERAL : ('0' .. '9')+ ;
LONGLITERAL : ('0' .. '9')+ L;
DATELITERAL : '{' D STRINGLITERAL '}';
TIMELITERAL : '{' T STRINGLITERAL '}';
TIMESTAMPLITERAL : '{' T S STRINGLITERAL '}';
DATELITERAL : '{' D [ \t\r\n]* STRINGLITERAL '}';
TIMELITERAL : '{' T [ \t\r\n]* STRINGLITERAL '}';
TIMESTAMPLITERAL : '{' T S [ \t\r\n]* STRINGLITERAL '}';
6 changes: 3 additions & 3 deletions spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,6 @@ JAVASTRINGLITERAL : '"' ( ('\\' [btnfr"']) | ~('"'))* '"';
FLOATLITERAL : ('0' .. '9')* '.' ('0' .. '9')+ (E ('0' .. '9')+)* (F|D)?;
INTLITERAL : ('0' .. '9')+ ;
LONGLITERAL : ('0' .. '9')+ L;
DATELITERAL : '{' D STRINGLITERAL '}';
TIMELITERAL : '{' T STRINGLITERAL '}';
TIMESTAMPLITERAL : '{' T S STRINGLITERAL '}';
DATELITERAL : '{' D [ \t\r\n]* STRINGLITERAL '}';
TIMELITERAL : '{' T [ \t\r\n]* STRINGLITERAL '}';
TIMESTAMPLITERAL : '{' T S [ \t\r\n]* STRINGLITERAL '}';
9 changes: 9 additions & 0 deletions ...pa/src/test/java/org/springframework/data/jpa/repository/query/EqlQueryRendererTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
* @author Greg Turnquist
* @author Christoph Strobl
* @author Mark Paluch
* @author Jewoo Shin
*/
class EqlQueryRendererTests extends JpqlQueryRendererTckTests {

Expand Down Expand Up @@ -76,6 +77,14 @@ void currentTimeLiterals() {
assertQuery("SELECT e.name, CURRENT_TIMESTAMP FROM Employee e");
}

@Test
void jdbcEscapeLiteralsWithWhitespace() {

assertQuery("SELECT e FROM Employee e WHERE e.startDate = {d '2012-01-03'}");
assertQuery("SELECT e FROM Employee e WHERE e.startTime = {t '09:00:00'}");
assertQuery("SELECT e FROM Employee e WHERE e.version = {ts '2012-01-03 09:00:00.000000001'}");
}

@Test
void numericCasting() {
assertQuery("SELECT e FROM Employee e WHERE CAST(e.salary NUMERIC(10, 2)) > 0.0");
Expand Down
9 changes: 9 additions & 0 deletions ...a/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
* @author Greg Turnquist
* @author Christoph Strobl
* @author Mark Paluch
* @author Jewoo Shin
* @since 3.1
*/
class JpqlQueryRendererTests extends JpqlQueryRendererTckTests {
Expand Down Expand Up @@ -110,6 +111,14 @@ void currentTimeLiterals() {
assertQuery("SELECT e.name, CURRENT_TIMESTAMP FROM Employee e");
}

@Test
void jdbcEscapeLiteralsWithWhitespace() {

assertQuery("SELECT e FROM Employee e WHERE e.startDate = {d '2012-01-03'}");
assertQuery("SELECT e FROM Employee e WHERE e.startTime = {t '09:00:00'}");
assertQuery("SELECT e FROM Employee e WHERE e.version = {ts '2012-01-03 09:00:00.000000001'}");
}

@Test
void numericCasting() {
assertQuery("SELECT e FROM Employee e WHERE CAST(e.salary NUMERIC(10, 2)) > 0.0");
Expand Down
Loading