Skip to content

Update parser grammar for eclipselink. #3316

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

Closed
wants to merge 2 commits into from
Closed

Update parser grammar for eclipselink. #3316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e20591
Prepare issue branch.
christophstrobl Jan 15, 2024
d0a68c1
Update Eclipselink grammar to support = & != for null comparison.
christophstrobl Jan 15, 2024
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.x-3314-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data JPA Parent</name>
Expand Down
4 changes: 2 additions & 2 deletions spring-data-envers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-envers</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.x-3314-SNAPSHOT</version>

<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.x-3314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-jpa-distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.x-3314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions spring-data-jpa/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.x-3314-SNAPSHOT</version>

<name>Spring Data JPA</name>
<description>Spring Data module for JPA repositories.</description>
Expand All @@ -15,7 +15,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<version>3.3.x-3314-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -362,7 +362,7 @@ like_expression
;

null_comparison_expression
: (single_valued_path_expression | input_parameter | nullif_expression) IS (NOT)? NULL
: (single_valued_path_expression | input_parameter | nullif_expression) ((IS (NOT)?) | (op=(EQUAL | NOT_EQUAL))) NULL
;

empty_collection_comparison_expression
Expand Down
11 changes: 7 additions & 4 deletions ...ata-jpa/src/main/java/org/springframework/data/jpa/repository/query/EqlQueryRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,10 +1315,13 @@ public List<JpaQueryParsingToken> visitNull_comparison_expression(EqlParser.Null
tokens.addAll(visit(ctx.nullif_expression()));
}

tokens.add(new JpaQueryParsingToken(ctx.IS()));

if (ctx.NOT() != null) {
tokens.add(new JpaQueryParsingToken(ctx.NOT()));
if(ctx.op != null) {
tokens.add(new JpaQueryParsingToken(ctx.op.getText()));
} else {
tokens.add(new JpaQueryParsingToken(ctx.IS()));
if (ctx.NOT() != null) {
tokens.add(new JpaQueryParsingToken(ctx.NOT()));
}
}
tokens.add(new JpaQueryParsingToken(ctx.NULL()));

Expand Down
13 changes: 13 additions & 0 deletions ...a-jpa/src/test/java/org/springframework/data/jpa/repository/query/EqlComplianceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,4 +403,17 @@ void coalesceFunctions() {
assertQuery("SELECT b FROM Bundle b WHERE coalesce(b.deleted, false) AND b.latestImport = true");
assertQuery("SELECT b FROM Bundle b WHERE NOT coalesce(b.deleted, false) AND b.latestImport = true");
}

@Test // GH-3314
void isNullAndIsNotNull() {

assertQuery("SELECT e FROM Employee e WHERE (e.active = null OR e.active = true)");
assertQuery("SELECT e FROM Employee e WHERE (e.active = NULL OR e.active = true)");
assertQuery("SELECT e FROM Employee e WHERE (e.active IS null OR e.active = true)");
assertQuery("SELECT e FROM Employee e WHERE (e.active IS NULL OR e.active = true)");
assertQuery("SELECT e FROM Employee e WHERE (e.active != null OR e.active = true)");
assertQuery("SELECT e FROM Employee e WHERE (e.active != NULL OR e.active = true)");
assertQuery("SELECT e FROM Employee e WHERE (e.active IS NOT null OR e.active = true)");
assertQuery("SELECT e FROM Employee e WHERE (e.active IS NOT NULL OR e.active = true)");
}
}