Skip to content
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

Introduce JPQL/HQL parser for JPQ queries #2846

Closed
wants to merge 13 commits into from
Closed

Introduce JPQL/HQL parser for JPQ queries #2846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dff47e6
Prepare branch.
gregturn Feb 10, 2023
3561667
Create JPQL and HQL parsers.
gregturn Feb 16, 2023
0e098e6
Polishing.
gregturn Mar 8, 2023
169552b
Convert QueryParser to an abstract class.
gregturn Mar 8, 2023
4c99d91
Slim down the QueryParsingToken value object.
gregturn Mar 8, 2023
3bd71e8
Implemented support for some Hibernate-specific functions.
gregturn Mar 9, 2023
07b75a8
Introduce Sort unSafe checks.
gregturn Mar 9, 2023
c35c914
Introduce flyweights for re-used tokens.
gregturn Mar 10, 2023
1afc493
Rename QueryParser/QueryParsing classes as JpaQueryParser/JpaQueryPar…
gregturn Mar 10, 2023
1fb5580
Extract HqlQueryRenderer out of HqlQueryTransformer.
gregturn Mar 10, 2023
4e02b10
Extract JpqlQueryRenderer out of JpqlQueryTransformer.
gregturn Mar 11, 2023
a13a9bc
Move the parsing routines inside JpaQueryParser.
gregturn Mar 11, 2023
4aa2af5
Polishing.
mp911de Mar 14, 2023
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
5 changes: 3 additions & 2 deletions 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.1.0-SNAPSHOT</version>
<version>3.1.0-jpql-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data JPA Parent</name>
Expand All @@ -28,8 +28,9 @@

<properties>
<source.level>16</source.level>
<!-- AspectJ maven plugin can't handle 17 yet -->
<!-- AspectJ maven plugin can't handle 17 yet -->

<antlr>4.10.1</antlr> <!-- align with Hibernate's parser -->
<eclipselink>3.0.3</eclipselink>
<hibernate>6.1.4.Final</hibernate>
<hsqldb>2.7.1</hsqldb>
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.1.0-SNAPSHOT</version>
<version>3.1.0-jpql-SNAPSHOT</version>

<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa-parent</artifactId>
<version>3.1.0-SNAPSHOT</version>
<version>3.1.0-jpql-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.1.0-SNAPSHOT</version>
<version>3.1.0-jpql-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
53 changes: 49 additions & 4 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.1.0-SNAPSHOT</version>
<version>3.1.0-jpql-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.1.0-SNAPSHOT</version>
<version>3.1.0-jpql-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -73,6 +73,12 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>${antlr}</version>
</dependency>

<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
Expand Down Expand Up @@ -247,8 +253,8 @@
<plugins>

<!--
Jacoco plugin redeclared to make sure it's downloaded and
the agents can be explicitly added to the test executions.
Jacoco plugin redeclared to make sure it's downloaded and
the agents can be explicitly added to the test executions.
-->
<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -344,6 +350,45 @@
</executions>
</plugin>

<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>${antlr}</version>
<executions>
<execution>
<goals>
<goal>antlr4</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<visitor>true</visitor>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<version>1.4.1</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<includes>
<include>target/generated-sources/antlr4/**/*.java</include>
</includes>
<variableTokenValueMap>
public class=class,public interface=interface
</variableTokenValueMap>
</configuration>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
Expand Down
Loading