From 8164b101bfb0543705c59d349f748940d2b90f8f Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Thu, 2 Jul 2020 09:33:42 +0200
Subject: [PATCH] DATAGRAPH-1323 - Update to Neo4j-OGM 3.2.13.

---
 pom.xml                                         |  2 +-
 .../examples/movies/repo/CinemaRepository.java  |  2 ++
 .../data/neo4j/queries/DerivedQueryTests.java   | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index da5e1dc2e..64c9770d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
 		<project.type>multi</project.type>
 
-		<neo4j.ogm.version>3.2.11</neo4j.ogm.version>
+		<neo4j.ogm.version>3.2.13</neo4j.ogm.version>
 		<springdata.commons>2.2.9.BUILD-SNAPSHOT</springdata.commons>
 	</properties>
 
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/movies/repo/CinemaRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/movies/repo/CinemaRepository.java
index f8ac914b3..f8396edf1 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/movies/repo/CinemaRepository.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/examples/movies/repo/CinemaRepository.java
@@ -80,6 +80,8 @@ public interface CinemaRepository extends Neo4jRepository<Cinema, Long> {
 
 	List<Cinema> findByVisitedNameOrBlockbusterOfTheWeekName(String location, String name);
 
+	List<Cinema> findByVisitedNameOrVisitedMiddleName(String name, String middleName);
+
 	List<Cinema> findByVisitedNameAndVisitedMiddleName(String name, String middleName);
 
 	List<Cinema> findByNameMatches(String name);
diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java
index b35009b8b..013e65905 100644
--- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java
+++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/DerivedQueryTests.java
@@ -363,6 +363,23 @@ public class DerivedQueryTests {
 		});
 	}
 
+	@Test
+	public void shouldFindNodeEntititiesWithMultipleNestedPropertiesOred() {
+		executeUpdate("CREATE (p:Theatre {name:'Picturehouse', city:'London', capacity:5000}) "
+				+ " CREATE (r:Theatre {name:'Ritzy', city:'London', capacity: 7500}) "
+				+ " CREATE (u:User {name:'Michal', middleName:'M'}) CREATE (u1:User {name:'Vince', middleName:'M'}) "
+				+ " CREATE (u)-[:VISITED]->(p)  CREATE (u1)-[:VISITED]->(r)");
+
+		transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+			@Override
+			public void doInTransactionWithoutResult(TransactionStatus status) {
+				List<Cinema> theatres = cinemaRepository.findByVisitedNameOrVisitedMiddleName("Vince", "M");
+				assertThat(theatres.size()).isEqualTo(2);
+				assertThat(theatres).extracting(Cinema::getName).containsExactlyInAnyOrder("Picturehouse", "Ritzy");
+			}
+		});
+	}
+
 	@Test // DATAGRAPH-629
 	public void shouldFindNodeEntititiesWithMultipleNestedPropertiesAnded() {
 		executeUpdate("CREATE (p:Theatre {name:'Picturehouse', city:'London', capacity:5000}) "