[fix] Fix searching with the separator "+" (darrachequesne#55)

Previously, searching with "+" threw SQLException on (at least) Postgres and MySQL.

Author: darrachequesne

src/main/java/org/springframework/data/jpa/datatables/qrepository/PredicateFactory.java

@@ -57,6 +57,12 @@ public static Predicate createPredicate(PathBuilder<?> entity, DataTablesInput i
  predicate = predicate.and(in);
  }
  } else {
+ if (values.isEmpty()) {
+ if (nullable) {
+ predicate = predicate.and(entity.get(column.getData()).isNull());
+ }
+ continue;
+ }
  Predicate in = getStringExpression(entity, column.getData()).in(values);
  if (nullable) {
  predicate = predicate.and(entity.get(column.getData()).isNull().or(in));

src/main/java/org/springframework/data/jpa/datatables/repository/SpecificationFactory.java

@@ -80,6 +80,12 @@ public Predicate toPredicate(Root<T> root, CriteriaQuery<?> query, CriteriaBuild
  }
  } else {
  stringExpression = getExpression(root, column.getData(), String.class);
+ if (values.isEmpty()) {
+ if (nullable) {
+ predicate = cb.and(predicate, stringExpression.isNull());
+ }
+ continue;
+ }
  Predicate in = stringExpression.in(values);
  if (nullable) {
  predicate = cb.and(predicate, cb.or(in, stringExpression.isNull()));

src/test/java/org/springframework/data/jpa/datatables/qrepository/QBillRepositoryTest.java

@@ -66,6 +66,17 @@ public void testFilterIsNull() {
  assertEquals(1, output.getRecordsFiltered());
  }
 
+ @Test
+ public void testFilterIsNullWithSeparator() {
+ DataTablesInput input = getBasicInput();
+
+ input.getColumn("hasBeenPayed").setSearchValue("NULL+");
+ DataTablesOutput<Bill> output = billRepository.findAll(input);
+ assertNotNull(output);
+ assertNull(output.getError());
+ assertEquals(1, output.getRecordsFiltered());
+ }
+
  @Test
  public void testBooleanFilter2() {
  DataTablesInput input = getBasicInput();

src/test/java/org/springframework/data/jpa/datatables/qrepository/QUserRepositoryTest.java

@@ -241,6 +241,18 @@ public void testMultiFilterOnSameColumn() {
  assertEquals("USER", lastUser.getRole().toString());
  }
 
+ @Test
+ public void testEmptyMultiFilterOnSameColumn() {
+ DataTablesInput input = getBasicInput();
+
+ input.getColumn("role").setSearchValue("+");
+
+ DataTablesOutput<User> output = userRepository.findAll(input);
+ assertNotNull(output);
+ assertNull(output.getError());
+ assertEquals(24, output.getRecordsFiltered());
+ }
+
  @Test
  public void testFilterOnManyToOneRelationship() {
  DataTablesInput input = getBasicInput();

src/test/java/org/springframework/data/jpa/datatables/repository/BillRepositoryTest.java

@@ -67,6 +67,17 @@ public void testFilterIsNull() {
  assertEquals(1, output.getRecordsFiltered());
  }
 
+ @Test
+ public void testFilterIsNullWithSeparator() {
+ DataTablesInput input = getBasicInput();
+
+ input.getColumn("hasBeenPayed").setSearchValue("NULL+");
+ DataTablesOutput<Bill> output = billRepository.findAll(input);
+ assertNotNull(output);
+ assertNull(output.getError());
+ assertEquals(1, output.getRecordsFiltered());
+ }
+
  @Test
  public void testBooleanFilter2() {
  DataTablesInput input = getBasicInput();

src/test/java/org/springframework/data/jpa/datatables/repository/UserRepositoryTest.java

@@ -238,6 +238,18 @@ public void testMultiFilterOnSameColumn() {
  assertEquals("USER", lastUser.getRole().toString());
  }
 
+ @Test
+ public void testEmptyMultiFilterOnSameColumn() {
+ DataTablesInput input = getBasicInput();
+
+ input.getColumn("role").setSearchValue("+");
+
+ DataTablesOutput<User> output = userRepository.findAll(input);
+ assertNotNull(output);
+ assertNull(output.getError());
+ assertEquals(24, output.getRecordsFiltered());
+ }
+
  @Test
  public void testFilterOnManyToOneRelationship() {
  DataTablesInput input = getBasicInput();