spring-projects#282 - Implement disjunction of conditions

Author: rchigvintsev

Diff for: src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java

@@ -79,13 +79,13 @@ protected Condition create(Part part, Iterator<Object> iterator) {
     }
 
     @Override
-    protected Condition and(Part part, Condition condition, Iterator<Object> iterator) {
-        return condition.and(conditionFactory.createCondition(part));
+    protected Condition and(Part part, Condition base, Iterator<Object> iterator) {
+        return base.and(conditionFactory.createCondition(part));
     }
 
     @Override
-    protected Condition or(Condition condition, Condition s1) {
-        throw new UnsupportedOperationException();
+    protected Condition or(Condition base, Condition condition) {
+        return base.or(condition);
     }
 
     /**

Diff for: src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryIntegrationTests.java

@@ -121,6 +121,17 @@ public void createsQueryToFindAllEntitiesByTwoStringAttributes() throws Exceptio
         assertThat(bindableQuery.get()).isEqualTo(expectedSql);
     }
 
+    @Test
+    public void createsQueryToFindAllEntitiesByOneOfTwoStringAttributes() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findByLastNameOrFirstName", String.class, String.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(getAccessor(queryMethod, new Object[]{"Doe", "John"}));
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE
+                + " WHERE " + TABLE + ".last_name = ? OR " + TABLE + ".first_name = ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
     private R2dbcQueryMethod getQueryMethod(String methodName, Class<?>... parameterTypes) throws Exception {
         Method method = UserRepository.class.getMethod(methodName, parameterTypes);
         return new R2dbcQueryMethod(method, new DefaultRepositoryMetadata(UserRepository.class),
@@ -136,6 +147,8 @@ private interface UserRepository extends Repository<User, Long> {
 
         Flux<User> findByLastNameAndFirstName(String lastName, String firstName);
 
+        Flux<User> findByLastNameOrFirstName(String lastName, String firstName);
+
         Mono<Boolean> existsByFirstName(String firstName);
     }