Skip to content

Commit ddde992

Browse files
ilgrossomichael-simons
authored andcommitted
fix: Check for Pageable.unpaged when requesting pages.
1 parent 3d261f2 commit ddde992

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/main/java/org/springframework/data/neo4j/repository/query/QueryFragmentsAndParameters.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,14 @@ private static void adaptPageable(
367367
Pageable pageable,
368368
QueryFragments queryFragments
369369
) {
370+
if (pageable.isPaged()) {
371+
queryFragments.setSkip(pageable.getOffset());
372+
queryFragments.setLimit(pageable.getPageSize());
373+
}
370374
Sort pageableSort = pageable.getSort();
371-
queryFragments.setSkip(pageable.getOffset());
372-
queryFragments.setLimit(pageable.getPageSize());
373-
queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
375+
if (pageableSort.isSorted()) {
376+
queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
377+
}
374378
}
375379

376380
}

0 commit comments

Comments
 (0)