DATAGRAPH-895 - Auto-paging does not work when @query ends with ';'.

spring-projects · Aug 5, 2016 · 398110e · 398110e
1 parent 37179a3
commit 398110e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...j/src/main/java/org/springframework/data/neo4j/repository/query/GraphRepositoryQuery.java b/...j/src/main/java/org/springframework/data/neo4j/repository/query/GraphRepositoryQuery.java
@@ -143,6 +143,10 @@ protected String addSorting(String baseQuery, Sort sort) {
 
 	protected String makePageable(String cypherQuery, Map<String, Object> queryParams, int pageNumber, int pageSize) {
 		//Custom queries in the OGM do not support pageable
+		cypherQuery = cypherQuery.trim();
+		if (cypherQuery.endsWith(";")) {
+			cypherQuery = cypherQuery.substring(0, cypherQuery.length() - 1);
+		}
 		cypherQuery = cypherQuery + SKIP_LIMIT;
 		queryParams.put(SKIP, pageNumber * pageSize);
 		if (graphQueryMethod.isSliceQuery()) {

diff --git a/...j/src/test/java/org/springframework/data/neo4j/examples/movies/repo/CinemaRepository.java b/...j/src/test/java/org/springframework/data/neo4j/examples/movies/repo/CinemaRepository.java
@@ -75,7 +75,7 @@ public interface CinemaRepository extends GraphRepository<Cinema> {
 
 	Cinema findByName(String name, @Depth int depth);
 
-	@Query("MATCH (n:Theatre) RETURN n")
+	@Query("MATCH (n:Theatre) RETURN n;")
 	Page<Cinema> getPagedCinemas(Pageable pageable);
 
 	@Query("MATCH (n:Theatre) RETURN n")