Update SqlPagingQueryUtils

Remove table aliases of the sort keys when the PagingQueryProvider uses sort keys with table aliases and a GROUP BY clause.

Signed-off-by: KyeongHoon Lee <[email protected]>

Author: pongdangx2

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryUtils.java

@@ -109,8 +109,8 @@ public static String generateLimitGroupedSqlQuery(AbstractSqlPagingQueryProvider
 		buildGroupByClause(provider, sql);
 		sql.append(") AS MAIN_QRY ");
 		sql.append("WHERE ");
-		buildSortConditions(provider, sql);
-		sql.append(" ORDER BY ").append(buildSortClause(provider));
+		buildSortConditionsWithoutTableAliases(provider, sql);
+		sql.append(" ORDER BY ").append(buildSortClause(provider.getSortKeysWithoutAliases()));
 		sql.append(" ").append(limitClause);
 
 		return sql.toString();
@@ -270,6 +270,19 @@ public static String buildSortClause(Map<String, Order> sortKeys) {
 		return builder.toString();
 	}
 
+	/**
+	 * Appends the where conditions required to query for the subsequent pages, without
+	 * using table aliases in sort keys.
+	 * @param provider the {@link AbstractSqlPagingQueryProvider} to be used for
+	 * pagination.
+	 * @param sql {@link StringBuilder} containing the sql to be used for the query.
+	 */
+	public static void buildSortConditionsWithoutTableAliases(AbstractSqlPagingQueryProvider provider,
+			StringBuilder sql) {
+		List<Map.Entry<String, Order>> keys = new ArrayList<>(provider.getSortKeysWithoutAliases().entrySet());
+		buildDetailSortConditions(keys, provider, sql);
+	}
+
 	/**
 	 * Appends the where conditions required to query for the subsequent pages.
 	 * @param provider the {@link AbstractSqlPagingQueryProvider} to be used for
@@ -278,6 +291,11 @@ public static String buildSortClause(Map<String, Order> sortKeys) {
 	 */
 	public static void buildSortConditions(AbstractSqlPagingQueryProvider provider, StringBuilder sql) {
 		List<Map.Entry<String, Order>> keys = new ArrayList<>(provider.getSortKeys().entrySet());
+		buildDetailSortConditions(keys, provider, sql);
+	}
+
+	private static void buildDetailSortConditions(List<Map.Entry<String, Order>> keys,
+			AbstractSqlPagingQueryProvider provider, StringBuilder sql) {
 		List<String> clauses = new ArrayList<>();
 
 		for (int i = 0; i < keys.size(); i++) {

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/MySqlPagingQueryProviderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.LinkedHashMap;
 
 import org.junit.jupiter.api.Test;
 
@@ -27,6 +28,7 @@
 /**
  * @author Thomas Risberg
  * @author Michael Minella
+ * @author Kyeonghoon Lee
  */
 class MySqlPagingQueryProviderTests extends AbstractSqlPagingQueryProviderTests {
 
@@ -68,6 +70,22 @@ void testGenerateRemainingPagesQueryWithGroupBy() {
 		assertEquals(sql, s);
 	}
 
+	@Test
+	void testGenerateRemainingPagesQueryWithGroupByWithAlias() {
+		pagingQueryProvider.setSelectClause("SELECT f.id, f.name, f.age");
+		pagingQueryProvider.setFromClause("FROM foo f");
+		pagingQueryProvider.setWhereClause("f.bar = 1");
+		pagingQueryProvider.setGroupClause("dep");
+		Map<String, Order> sortKeys = new LinkedHashMap<>();
+		sortKeys.put("f.id", Order.ASCENDING);
+		pagingQueryProvider.setSortKeys(sortKeys);
+
+		String sql = "SELECT *  FROM (SELECT f.id, f.name, f.age FROM foo f WHERE f.bar = 1 GROUP BY dep) AS MAIN_QRY WHERE ((id > ?)) ORDER BY id ASC LIMIT "
+				+ pageSize;
+		String s = pagingQueryProvider.generateRemainingPagesQuery(pageSize);
+		assertEquals(sql, s);
+	}
+
 	@Test
 	void testFirstPageSqlWithAliases() {
 		Map<String, Order> sorts = new HashMap<>();