Support HQL LIMIT/OFFSET without ordering.

Closes #3882

Author: mp911de

spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Hql.g4

@@ -85,7 +85,7 @@ cteAttributes
     ;
 
 orderedQuery
-    : (query | '(' queryExpression ')') queryOrder?
+    : (query | '(' queryExpression ')') queryOrder?  limitClause? offsetClause? fetchClause?
     ;
 
 query
@@ -94,7 +94,7 @@ query
     ;
 
 queryOrder
-    : orderByClause limitClause? offsetClause? fetchClause?
+    : orderByClause
     ;
 
 fromClause

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlCountQueryTransformer.java

@@ -61,8 +61,16 @@ public QueryRendererBuilder visitOrderedQuery(HqlParser.OrderedQueryContext ctx)
 			builder.appendExpression(nested);
 		}
 
-		if (ctx.queryOrder() != null) {
-			builder.append(visit(ctx.queryOrder()));
+		if (ctx.limitClause() != null) {
+			builder.appendExpression(visit(ctx.limitClause()));
+		}
+
+		if (ctx.offsetClause() != null) {
+			builder.appendExpression(visit(ctx.offsetClause()));
+		}
+
+		if (ctx.fetchClause() != null) {
+			builder.appendExpression(visit(ctx.fetchClause()));
 		}
 
 		return builder;
@@ -235,26 +243,6 @@ public QueryTokenStream visitSelection(HqlParser.SelectionContext ctx) {
 		return builder;
 	}
 
-	@Override
-	public QueryRendererBuilder visitQueryOrder(HqlParser.QueryOrderContext ctx) {
-
-		QueryRendererBuilder builder = QueryRenderer.builder();
-
-		if (ctx.limitClause() != null) {
-			builder.appendExpression(visit(ctx.limitClause()));
-		}
-
-		if (ctx.offsetClause() != null) {
-			builder.appendExpression(visit(ctx.offsetClause()));
-		}
-
-		if (ctx.fetchClause() != null) {
-			builder.appendExpression(visit(ctx.fetchClause()));
-		}
-
-		return builder;
-	}
-
 	private QueryRendererBuilder visitSubQuerySelectClause(SelectClauseContext ctx, QueryRendererBuilder builder) {
 
 		if (ctx.DISTINCT() != null) {

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlQueryRenderer.java

@@ -239,6 +239,18 @@ public QueryTokenStream visitOrderedQuery(HqlParser.OrderedQueryContext ctx) {
 			builder.append(visit(ctx.queryOrder()));
 		}
 
+		if (ctx.limitClause() != null) {
+			builder.appendExpression(visit(ctx.limitClause()));
+		}
+
+		if (ctx.offsetClause() != null) {
+			builder.appendExpression(visit(ctx.offsetClause()));
+		}
+
+		if (ctx.fetchClause() != null) {
+			builder.appendExpression(visit(ctx.fetchClause()));
+		}
+
 		return builder;
 	}
 
@@ -298,26 +310,7 @@ public QueryTokenStream visitFromQuery(HqlParser.FromQueryContext ctx) {
 
 	@Override
 	public QueryTokenStream visitQueryOrder(HqlParser.QueryOrderContext ctx) {
-
-		if (ctx.limitClause() == null && ctx.offsetClause() == null && ctx.fetchClause() == null) {
-			return visit(ctx.orderByClause());
-		}
-
-		QueryRendererBuilder builder = QueryRenderer.builder();
-
-		builder.appendExpression(visit(ctx.orderByClause()));
-
-		if (ctx.limitClause() != null) {
-			builder.appendExpression(visit(ctx.limitClause()));
-		}
-		if (ctx.offsetClause() != null) {
-			builder.appendExpression(visit(ctx.offsetClause()));
-		}
-		if (ctx.fetchClause() != null) {
-			builder.appendExpression(visit(ctx.fetchClause()));
-		}
-
-		return builder;
+		return visit(ctx.orderByClause());
 	}
 
 	@Override

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/HqlSortedQueryTransformer.java

@@ -179,6 +179,18 @@ private QueryRendererBuilder visitOrderedQuery(HqlParser.OrderedQueryContext ctx
 			}
 		}
 
+		if (ctx.limitClause() != null) {
+			builder.appendExpression(visit(ctx.limitClause()));
+		}
+
+		if (ctx.offsetClause() != null) {
+			builder.appendExpression(visit(ctx.offsetClause()));
+		}
+
+		if (ctx.fetchClause() != null) {
+			builder.appendExpression(visit(ctx.fetchClause()));
+		}
+
 		return builder;
 	}
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HqlQueryRendererTests.java

@@ -1676,6 +1676,20 @@ void orderByWithNullsFirstOrLastShouldWork() {
 		});
 	}
 
+	@Test // GH-3882
+	void shouldSupportLimitOffset() {
+
+		assertQuery("SELECT si from StockItem si order by si.id LIMIT 10 OFFSET 10 FETCH FIRST 10 ROWS ONLY");
+		assertQuery("SELECT si from StockItem si order by si.id LIMIT ? OFFSET ? FETCH FIRST ? ROWS ONLY");
+		assertQuery("SELECT si from StockItem si order by si.id LIMIT :l OFFSET :o");
+		assertQuery("SELECT si from StockItem si LIMIT :l OFFSET :o");
+		assertQuery("SELECT si from StockItem si order by si.id LIMIT :l");
+		assertQuery("SELECT si from StockItem si order by si.id OFFSET 1");
+		assertQuery("SELECT si from StockItem si LIMIT 1");
+		assertQuery("SELECT si from StockItem si OFFSET 1");
+		assertQuery("SELECT si from StockItem si FETCH FIRST 1 ROWS ONLY");
+	}
+
 	@Test // GH-2964
 	void roundFunctionShouldWorkLikeAnyOtherFunction() {