Skip to content

Commit a232264

Browse files
ilgrossomichael-simons
authored andcommitted
fix: Check for Pageable.unpaged when requesting pages.
1 parent 97d6453 commit a232264

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
@@ -242,10 +242,14 @@ private static void adaptPageable(
242242
Pageable pageable,
243243
QueryFragments queryFragments
244244
) {
245+
if (pageable.isPaged()) {
246+
queryFragments.setSkip(pageable.getOffset());
247+
queryFragments.setLimit(pageable.getPageSize());
248+
}
245249
Sort pageableSort = pageable.getSort();
246-
queryFragments.setSkip(pageable.getOffset());
247-
queryFragments.setLimit(pageable.getPageSize());
248-
queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
250+
if (pageableSort.isSorted()) {
251+
queryFragments.setOrderBy(CypherAdapterUtils.toSortItems(entityMetaData, pageableSort));
252+
}
249253
}
250254

251255
static QueryFragmentsAndParameters forExample(Neo4jMappingContext mappingContext, Example<?> example,

0 commit comments

Comments
 (0)