add: sorting for keys not in query

Signed-off-by: Artemiy Degtyarev <[email protected]>

Author: Artemiy Degtyarev

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/query/StatementFactory.java

@@ -15,12 +15,7 @@
  */
 package org.springframework.data.jdbc.repository.query;
 
-import java.util.*;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import org.jspecify.annotations.Nullable;
-
 import org.springframework.data.domain.*;
 import org.springframework.data.jdbc.core.convert.JdbcConverter;
 import org.springframework.data.jdbc.core.convert.QueryMapper;
@@ -30,20 +25,18 @@
 import org.springframework.data.relational.core.mapping.AggregatePath;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
 import org.springframework.data.relational.core.query.Criteria;
-import org.springframework.data.relational.core.sql.Column;
-import org.springframework.data.relational.core.sql.Expressions;
-import org.springframework.data.relational.core.sql.Functions;
-import org.springframework.data.relational.core.sql.LockMode;
-import org.springframework.data.relational.core.sql.Select;
-import org.springframework.data.relational.core.sql.SelectBuilder;
-import org.springframework.data.relational.core.sql.Table;
+import org.springframework.data.relational.core.sql.*;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
 import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.util.Predicates;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.lang.Contract;
 
+import java.util.*;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
 /**
  * Utility to render SQL statements for entities, count/exists projections, and slice queries. This is an internal
  * utility and should not be used outside of the framework as it can change without deprecation notice.
@@ -210,6 +203,8 @@ public String build(MapSqlParameterSource parameterSource) {
 
 			SelectBuilder.SelectOrdered selectOrderBuilder = applyCriteria(criteria, entity, table, parameterSource,
 					whereBuilder);
+
+			sort = applyCriteriaOrderBy(sort, scrollPosition);
 			selectOrderBuilder = applyOrderBy(sort, entity, table, selectOrderBuilder);
 
 			SelectBuilder.BuildSelect completedBuildSelect = selectOrderBuilder;
@@ -222,12 +217,30 @@ public String build(MapSqlParameterSource parameterSource) {
 			return SqlRenderer.create(renderContextFactory.createRenderContext()).render(select);
 		}
 
-		@Nullable Criteria applyScrollCriteria(@Nullable Criteria criteria, @Nullable ScrollPosition position, Sort sort) {
+		Sort applyCriteriaOrderBy(Sort sort, @Nullable ScrollPosition scrollPosition) {
+			if (!(scrollPosition instanceof KeysetScrollPosition) || scrollPosition.isInitial())
+				return sort;
+
+			Set<String> orders = sort.get().map(Sort.Order::getProperty).collect(Collectors.toSet());
+
+			Set<String> keys = ((KeysetScrollPosition) scrollPosition).getKeys().keySet();
+
+			Set<String> notSorted = keys.stream().filter(it -> !orders.contains(it)).collect(Collectors.toSet());
+
+			if (notSorted.isEmpty())
+				return sort;
+
+			Sort.Direction defaultSort = sort.get().map(Sort.Order::getDirection).findAny()
+				.orElse(Sort.DEFAULT_DIRECTION);
+
+			return sort
+				.and(Sort.by(defaultSort, notSorted.toArray(new String[0])));
+		}
+
+		Criteria applyScrollCriteria(Criteria criteria, @Nullable ScrollPosition position, Sort sort) {
 			if (!(position instanceof KeysetScrollPosition) || position.isInitial() || ((KeysetScrollPosition) position).getKeys().isEmpty())
 				return criteria;
 
-			criteria = criteria == null ? Criteria.empty() : criteria;
-
 			Map<String, Object> keys = ((KeysetScrollPosition) position).getKeys();
 			List<String> columns = new ArrayList<>(keys.keySet());
 			List<Object> values = new ArrayList<>(keys.values());