Fix regression in HQL parsing when primary alias is missing.

christophstrobl · mp911de · commit 7ea9391c4357 · 2025-03-03T14:44:21.000+01:00
Original pull request: #3793 Closes #3792
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java
@@ -100,8 +100,13 @@ public QueryRendererBuilder visitFromQuery(HqlParser.FromQueryContext ctx) {
 
 		if (ctx.fromClause() != null) {
 			builder.appendExpression(visit(ctx.fromClause()));
+			if(primaryFromAlias == null) {
+				builder.append(TOKEN_AS);
+				builder.append(TOKEN_DOUBLE_UNDERSCORE);
+			}
 		}
 
+
 		if (ctx.whereClause() != null) {
 			builder.appendExpression(visit(ctx.whereClause()));
 		}
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryTransformerTests.java
@@ -919,11 +919,11 @@ void queryParserPicksCorrectAliasAmidstMultipleAlises() {
 		assertThat(alias("select u from User as u left join  u.roles as r")).isEqualTo("u");
 	}
 
-	@Test // GH-2032
+	@Test // GH-2032, GH-3792
 	void countQueryShouldWorkEvenWithoutExplicitAlias() {
 
 		assertCountQuery("FROM BookError WHERE portal = :portal",
-				"select count(__) FROM BookError WHERE portal = :portal");
+				"select count(__) FROM BookError AS __ WHERE portal = :portal");
 
 		assertCountQuery("FROM BookError b WHERE portal = :portal",
 				"select count(b) FROM BookError b WHERE portal = :portal");

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,13 @@ public QueryRendererBuilder visitFromQuery(HqlParser.FromQueryContext ctx) {`
`100`	`100`
`101`	`101`	`if (ctx.fromClause() != null) {`
`102`	`102`	`builder.appendExpression(visit(ctx.fromClause()));`
	`103`	`+ if(primaryFromAlias == null) {`
	`104`	`+ builder.append(TOKEN_AS);`
	`105`	`+ builder.append(TOKEN_DOUBLE_UNDERSCORE);`
	`106`	`+ }`
`103`	`107`	`}`
`104`	`108`
	`109`	`+`
`105`	`110`	`if (ctx.whereClause() != null) {`
`106`	`111`	`builder.appendExpression(visit(ctx.whereClause()));`
`107`	`112`	`}`