spring-projects#282 - Add support of 'LESS/GREATER THAN (EQUAL)' conditions

Author: rchigvintsev

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

@@ -66,6 +66,26 @@ public Condition createCondition(Part part) {
                 return Conditions.isGreaterOrEqualTo(pathExpression, firstBindMarker)
                         .and(Conditions.isLessOrEqualTo(pathExpression, secondBindMarker));
             }
+            case GREATER_THAN: {
+                Expression pathExpression = createPropertyPathExpression(part.getProperty());
+                BindMarker bindMarker = createBindMarker(parameterMetadataProvider.next(part));
+                return Conditions.isGreater(pathExpression, bindMarker);
+            }
+            case GREATER_THAN_EQUAL: {
+                Expression pathExpression = createPropertyPathExpression(part.getProperty());
+                BindMarker bindMarker = createBindMarker(parameterMetadataProvider.next(part));
+                return Conditions.isGreaterOrEqualTo(pathExpression, bindMarker);
+            }
+            case LESS_THAN: {
+                Expression pathExpression = createPropertyPathExpression(part.getProperty());
+                BindMarker bindMarker = createBindMarker(parameterMetadataProvider.next(part));
+                return Conditions.isLess(pathExpression, bindMarker);
+            }
+            case LESS_THAN_EQUAL: {
+                Expression pathExpression = createPropertyPathExpression(part.getProperty());
+                BindMarker bindMarker = createBindMarker(parameterMetadataProvider.next(part));
+                return Conditions.isLessOrEqualTo(pathExpression, bindMarker);
+            }
             case SIMPLE_PROPERTY: {
                 Expression pathExpression = createPropertyPathExpression(part.getProperty());
                 ParameterMetadata parameterMetadata = parameterMetadataProvider.next(part);

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

@@ -55,7 +55,8 @@ public class PartTreeR2dbcQueryIntegrationTests {
     private static final String ALL_FIELDS = TABLE + ".id, "
             + TABLE + ".first_name, "
             + TABLE + ".last_name, "
-            + TABLE + ".date_of_birth";
+            + TABLE + ".date_of_birth, "
+            + TABLE + ".age";
 
     @Mock
     private ConnectionFactory connectionFactory;
@@ -141,13 +142,57 @@ public void createsQueryToFindAllEntitiesByDateAttributeBetween() throws Excepti
         R2dbcQueryMethod queryMethod = getQueryMethod("findAllByDateOfBirthBetween", Date.class, Date.class);
         PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
                 dataAccessStrategy);
-        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[]{null, new Date()});
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[]{new Date(), new Date()});
         BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
         String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE
                 + " WHERE " + TABLE + ".date_of_birth >= ? AND " + TABLE + ".date_of_birth <= ?";
         assertThat(bindableQuery.get()).isEqualTo(expectedSql);
     }
 
+    @Test
+    public void createsQueryToFindAllEntitiesByIntegerAttributeLessThan() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByAgeLessThan", Integer.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[]{30});
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".age < ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
+    @Test
+    public void createsQueryToFindAllEntitiesByIntegerAttributeLessThanEqual() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByAgeLessThanEqual", Integer.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[]{30});
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".age <= ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
+    @Test
+    public void createsQueryToFindAllEntitiesByIntegerAttributeGreaterThan() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByAgeGreaterThan", Integer.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[]{30});
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".age > ?";
+        assertThat(bindableQuery.get()).isEqualTo(expectedSql);
+    }
+
+    @Test
+    public void createsQueryToFindAllEntitiesByIntegerAttributeGreaterThanEqual() throws Exception {
+        R2dbcQueryMethod queryMethod = getQueryMethod("findAllByAgeGreaterThanEqual", Integer.class);
+        PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
+                dataAccessStrategy);
+        RelationalParametersParameterAccessor accessor = getAccessor(queryMethod, new Object[]{30});
+        BindableQuery bindableQuery = r2dbcQuery.createQuery(accessor);
+        String expectedSql = "SELECT " + ALL_FIELDS + " FROM " + TABLE + " WHERE " + TABLE + ".age >= ?";
+        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),
@@ -168,6 +213,14 @@ private interface UserRepository extends Repository<User, Long> {
         Mono<Boolean> existsByFirstName(String firstName);
 
         Flux<User> findAllByDateOfBirthBetween(Date from, Date to);
+
+        Flux<User> findAllByAgeLessThan(Integer age);
+
+        Flux<User> findAllByAgeLessThanEqual(Integer age);
+
+        Flux<User> findAllByAgeGreaterThan(Integer age);
+
+        Flux<User> findAllByAgeGreaterThanEqual(Integer age);
     }
 
     @Table("users")
@@ -178,5 +231,6 @@ private static class User {
         private String firstName;
         private String lastName;
         private Date dateOfBirth;
+        private Integer age;
     }
 }