Skip to content

Handle sortItem in HQL parser correctly. #2965

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

Handle sortItem in HQL parser correctly. #2965

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
13f6e51
Create branch.
gregturn May 22, 2023
f758eb9
Properly implement handling sort items.
gregturn May 22, 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
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.2.0-SNAPSHOT</version>
<version>3.2.0-gh-2962-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.2.0-SNAPSHOT</version>
<version>3.2.0-gh-2962-SNAPSHOT</version>

<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa-parent</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0-gh-2962-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.2.0-SNAPSHOT</version>
<version>3.2.0-gh-2962-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.2.0-SNAPSHOT</version>
<version>3.2.0-gh-2962-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.2.0-SNAPSHOT</version>
<version>3.2.0-gh-2962-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 1 addition & 5 deletions spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@ values
: '(' expression (',' expression)* ')'
;

projectedItem
: (expression | instantiation) alias?
;

instantiation
: NEW instantiationTarget '(' instantiationArguments ')'
;
Expand Down Expand Up @@ -254,7 +250,7 @@ groupByClause
;

orderByClause
: ORDER BY projectedItem (',' projectedItem)*
: ORDER BY sortedItem (',' sortedItem)*
;

havingClause
Expand Down
22 changes: 2 additions & 20 deletions ...ata-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,24 +457,6 @@ public List<JpaQueryParsingToken> visitValues(HqlParser.ValuesContext ctx) {
return tokens;
}

@Override
public List<JpaQueryParsingToken> visitProjectedItem(HqlParser.ProjectedItemContext ctx) {

List<JpaQueryParsingToken> tokens = new ArrayList<>();

if (ctx.expression() != null) {
tokens.addAll(visit(ctx.expression()));
} else if (ctx.instantiation() != null) {
tokens.addAll(visit(ctx.instantiation()));
}

if (ctx.alias() != null) {
tokens.addAll(visit(ctx.alias()));
}

return tokens;
}

@Override
public List<JpaQueryParsingToken> visitInstantiation(HqlParser.InstantiationContext ctx) {

Expand Down Expand Up @@ -858,8 +840,8 @@ public List<JpaQueryParsingToken> visitOrderByClause(HqlParser.OrderByClauseCont
tokens.add(new JpaQueryParsingToken(ctx.ORDER()));
tokens.add(new JpaQueryParsingToken(ctx.BY()));

ctx.projectedItem().forEach(projectedItemContext -> {
tokens.addAll(visit(projectedItemContext));
ctx.sortedItem().forEach(sortedItemContext -> {
tokens.addAll(visit(sortedItemContext));
NOSPACE(tokens);
tokens.add(TOKEN_COMMA);
});
Expand Down