fix: remove second compare for one-key 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

@@ -258,11 +258,14 @@ Criteria applyScrollCriteria(Criteria criteria, @Nullable ScrollPosition positio
 			Sort.Direction dir = directions.getOrDefault(primary, Sort.DEFAULT_DIRECTION);
 
 			if (keyset.scrollsForward() ^ dir.isDescending()) {
-				primaryCompare = Criteria.where(primary).greaterThanOrEquals(primaryValue);
+				primaryCompare = columns.size() != 1 ? Criteria.where(primary).greaterThanOrEquals(primaryValue) : Criteria.where(primary).greaterThan(primaryValue);
 			} else {
-				primaryCompare = Criteria.where(primary).lessThanOrEquals(primaryValue);
+				primaryCompare = columns.size() != 1 ? Criteria.where(primary).lessThanOrEquals(primaryValue) : Criteria.where(primary).lessThan(primaryValue);
 			}
 
+			if (columns.size() == 1)
+				return criteria.and(primaryCompare);
+
 			Criteria tupleCompare = null;
 			for (int i = 0; i < columns.size(); i++) {
 				Criteria orCriteria;

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

@@ -1560,7 +1560,9 @@ void queryByWindowKeySetTwoKeys() {
 		DummyEntity five = repository.save(createEntity("five", it -> it.setPointInTime(Instant.ofEpochSecond(5000))));
 
 		WindowIterator<DummyEntity> iter = WindowIterator.of(position -> repository.findFirst2ByOrderByIdPropAsc(position))
-			.startingAt(ScrollPosition.forward(Map.of("idProp", 1, "pointInTime", Instant.ofEpochSecond(1000))));
+			.startingAt(ScrollPosition.forward(
+				Map.of("idProp", 1, "pointInTime", Instant.ofEpochSecond(1000))
+			));
 
 		List<DummyEntity> entities = new ArrayList<>();
 		while (iter.hasNext())