diff --git a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4 b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4 index c429687b778..80af871fc62 100644 --- a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4 +++ b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4 @@ -139,10 +139,6 @@ values : '(' expression (',' expression)* ')' ; -projectedItem - : (expression | instantiation) alias? - ; - instantiation : NEW instantiationTarget '(' instantiationArguments ')' ; @@ -254,7 +250,7 @@ groupByClause ; orderByClause - : ORDER BY projectedItem (',' projectedItem)* + : ORDER BY sortedItem (',' sortedItem)* ; havingClause diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java index f613352d6f7..1adfa142164 100644 --- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java +++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java @@ -457,24 +457,6 @@ public List visitValues(HqlParser.ValuesContext ctx) { return tokens; } - @Override - public List visitProjectedItem(HqlParser.ProjectedItemContext ctx) { - - List 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 visitInstantiation(HqlParser.InstantiationContext ctx) { @@ -858,8 +840,8 @@ public List 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); });