GH-2274 - Apply toLower also for SpEL based order.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/core/mapping/CypherGenerator.java

@@ -15,6 +15,22 @@
  */
 package org.springframework.data.neo4j.core.mapping;
 
+import static org.neo4j.cypherdsl.core.Cypher.anyNode;
+import static org.neo4j.cypherdsl.core.Cypher.listBasedOn;
+import static org.neo4j.cypherdsl.core.Cypher.literalOf;
+import static org.neo4j.cypherdsl.core.Cypher.match;
+import static org.neo4j.cypherdsl.core.Cypher.node;
+import static org.neo4j.cypherdsl.core.Cypher.optionalMatch;
+import static org.neo4j.cypherdsl.core.Cypher.parameter;
+import static org.neo4j.cypherdsl.core.Functions.coalesce;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
+
 import org.apiguardian.api.API;
 import org.neo4j.cypherdsl.core.Condition;
 import org.neo4j.cypherdsl.core.Conditions;
@@ -41,22 +57,6 @@
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-
-import static org.neo4j.cypherdsl.core.Cypher.anyNode;
-import static org.neo4j.cypherdsl.core.Cypher.listBasedOn;
-import static org.neo4j.cypherdsl.core.Cypher.literalOf;
-import static org.neo4j.cypherdsl.core.Cypher.match;
-import static org.neo4j.cypherdsl.core.Cypher.node;
-import static org.neo4j.cypherdsl.core.Cypher.optionalMatch;
-import static org.neo4j.cypherdsl.core.Cypher.parameter;
-import static org.neo4j.cypherdsl.core.Functions.coalesce;
-
 /**
  * A generator based on the schema defined by node and relationship descriptions. Most methods return renderable Cypher
  * statements.
@@ -482,6 +482,9 @@ public Expression[] createReturnStatementForMatch(NodeDescription<?> nodeDescrip
 					} else {
 						expression = Cypher.name(property);
 					}
+					if (order.isIgnoreCase()) {
+						expression = Functions.toLower(expression);
+					}
 					return order.isAscending() ? expression.ascending() : expression.descending();
 				}).toArray(SortItem[]::new))
 				.build();

src/test/java/org/springframework/data/neo4j/integration/imperative/RepositoryIT.java

@@ -356,6 +356,24 @@ void findAllWithSortWithCaseIgnored(@Autowired PersonRepository repository) {
 					.containsExactly("aa", "Ab", "Test", "Test2");
 		}
 
+		@Test // GH-2274
+		void findAllWithSortWithCaseIgnoredSpelBased(@Autowired PersonRepository repository) {
+
+			try (Session session = createSession()) {
+				session.writeTransaction(tx -> {
+					tx.run("CREATE (n:PersonWithAllConstructor {name: 'Ab', firstName: 'n/a'})");
+					tx.run("CREATE (n:PersonWithAllConstructor {name: 'aa', firstName: 'n/a'})");
+					return null;
+				});
+			}
+
+			List<PersonWithAllConstructor> persons = repository
+					.orderBySpel(PageRequest.of(0, 10, Sort.by(Sort.Order.asc("n.name").ignoreCase())));
+			assertThat(persons)
+					.extracting(PersonWithAllConstructor::getName)
+					.containsExactly("aa", "Ab", "Test", "Test2");
+		}
+
 		@Test
 		void findAllWithPageable(@Autowired PersonRepository repository) {
 

src/test/java/org/springframework/data/neo4j/integration/imperative/repositories/PersonRepository.java

@@ -302,4 +302,7 @@ public DtoPersonProjectionContainingAdditionalFields getBySomeLongValue(long val
 
 	@Query("MATCH (n:PersonWithAllConstructor) return n")
 	List<PersonProjection> loadAllProjectionsWithNodeReturn();
+
+	@Query(value = "MATCH (n:PersonWithAllConstructor) RETURN n :#{ orderBy (#pageable.sort)} SKIP $skip LIMIT $limit")
+	List<PersonWithAllConstructor> orderBySpel(Pageable page);
 }