Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align OffsetScrolling to zero-based indexes.

Browse Source 
Closes #1764
This commit is contained in:
Mark Paluch
2024-04-10 15:56:28 +02:00
parent ad8ca20438
commit ae272e2a1e
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java
View File

@@ -409,7 +409,11 @@ public class SimpleR2dbcRepository<T, ID> implements R2dbcRepository<T, ID> {
int limit = getLimit();
return createQuery(q -> {
Query queryToUse = q.offset(osp.getOffset());
Query queryToUse = q;
if (!osp.isInitial()) {
queryToUse = queryToUse.offset(osp.getOffset() + 1);
}
if (limit > 0) {
queryToUse = queryToUse.limit(limit + 1);
@@ -419,8 +423,7 @@ public class SimpleR2dbcRepository<T, ID> implements R2dbcRepository<T, ID> {
}).all() //
.collectList() //
.map(content -> {
return ScrollDelegate.createWindow(content, limit,
OffsetScrollPosition.positionFunction(osp.getOffset()));
return ScrollDelegate.createWindow(content, limit, osp.positionFunction());
});
}