Properly implement handling sort items.

See #2962 Original Pull Request: #2965
spring-projects · May 22, 2023 · da37737 · da37737
1 parent cc90152
commit da37737
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 25 deletions.
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
@@ -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/...ata-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java b/...ata-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java
@@ -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) {
 
@@ -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);
 		});

diff --git a/...pa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java b/...pa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java
@@ -1430,4 +1430,32 @@ void hqlQueries() {
 				"order by p " + //
 				"limit 50");
 	}
+
+	@Test // GH-2962
+	void orderByWithNullsFirstOrLastShouldWork() {
+
+		assertThatNoException().isThrownBy(() -> {
+			parseWithoutChanges("""
+					select a,
+						case
+							when a.geaendertAm is null then a.erstelltAm
+							else a.geaendertAm end as mutationAm
+					from Element a
+					where a.erstelltDurch = :variable
+					order by mutationAm desc nulls first
+					""");
+		});
+
+		assertThatNoException().isThrownBy(() -> {
+			parseWithoutChanges("""
+					select a,
+						case
+							when a.geaendertAm is null then a.erstelltAm
+							else a.geaendertAm end as mutationAm
+					from Element a
+					where a.erstelltDurch = :variable
+					order by mutationAm desc nulls last
+					""");
+		});
+	}
 }