fix: remove unexpected sort creation when column already in sort

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

Author: chrshnv

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

@@ -24,6 +24,7 @@
 import org.springframework.data.relational.core.dialect.RenderContextFactory;
 import org.springframework.data.relational.core.mapping.AggregatePath;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
+import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.relational.core.sql.*;
 import org.springframework.data.relational.core.sql.render.SqlRenderer;
@@ -222,11 +223,29 @@ 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> orders = sort.get()
+				.map(Sort.Order::getProperty)
+				.map(it -> {
+					RelationalPersistentProperty prop = entity.getPersistentProperty(it);
+					if (prop == null)
+						return it;
+
+					return prop.getColumnName().getReference();
+				})
+				.collect(Collectors.toSet());
 
 			Set<String> keys = ((KeysetScrollPosition) scrollPosition).getKeys().keySet();
 
-			Set<String> notSorted = keys.stream().filter(it -> !orders.contains(it)).collect(Collectors.toSet());
+			Set<String> notSorted = keys
+				.stream()
+				.map(it -> {
+					RelationalPersistentProperty prop = entity.getPersistentProperty(it);
+					if (prop == null)
+						return it;
+
+					return prop.getColumnName().getReference();
+				})
+				.filter(it -> orders.stream().noneMatch(order -> order.equalsIgnoreCase(it))).collect(Collectors.toSet());
 
 			if (notSorted.isEmpty())
 				return sort;
@@ -267,6 +286,10 @@ Criteria buildKeysetCriteria(List<String> columns, List<Object> values, boolean
 				return Criteria.empty();
 
 			String column = columns.get(0);
+			RelationalPersistentProperty prop = entity.getPersistentProperty(column);
+			if (prop != null)
+				column = prop.getColumnName().getReference();
+
 			Object value = values.get(0);
 
 			boolean isAscending = isForward ^ dir.isDescending();