Bug fix and change filterMany to put predicates into JOIN clause, Fix for #3626 (#3707)

* Problem with filterMany

* Missing id

* Other test

* Fix

* Update TestQueryFilterMany.java

* #3706 Bug fix and change filterMany to put predicates into JOIN clause, Fix for #3626

* Fix tests for Postgres, Oracle, Sql Server

---------

Co-authored-by: Roman Parshikov <[email protected]>

Author: rbygrave

ebean-core/src/main/java/io/ebeaninternal/api/SpiQueryManyJoin.java

@@ -15,8 +15,4 @@ public interface SpiQueryManyJoin {
    */
   String fetchOrderBy();
 
-  /**
-   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
-   */
-  String idNullOr(String filterManyExpression);
 }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanFkeyProperty.java

@@ -36,11 +36,6 @@ public String toString() {
     return "prefix:" + prefix + " name:" + name + " dbColumn:" + dbColumn + " ph:" + placeHolder;
   }
 
-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public boolean isAggregation() {
     return false;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -513,11 +513,6 @@ public boolean isAssignableFrom(Class<?> type) {
     return owningType.isAssignableFrom(type);
   }
 
-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void loadIgnore(DbReadContext ctx) {
     ctx.dataReader().incrementPos(1);

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -634,11 +634,6 @@ public String fetchOrderBy() {
     return fetchOrderBy;
   }
 
-  @Override
-  public String idNullOr(String filterManyExpression) {
-    return targetIdBinder.idNullOr(name, filterManyExpression);
-  }
-
   /**
    * Return the order by for use when lazy loading the associated collection.
    */

ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java

@@ -154,4 +154,9 @@ public interface DbSqlContext {
    * as it was already added to the query.
    */
   boolean joinAdded();
+
+  /**
+   * Include the filter many predicates if specified into the JOIN clause.
+   */
+  void includeFilterMany();
 }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java

@@ -27,11 +27,6 @@ public interface IdBinder {
    */
   void initialise();
 
-  /**
-   * Wrap the filter many expression with a condition allowing lEFT JOIN null matching row.
-   */
-  String idNullOr(String name, String filterManyExpression);
-
   String idSelect();
 
   /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java

@@ -45,20 +45,6 @@ public void initialise() {
     this.idInValueSql = idInExpandedForm ? idInExpanded() : idInCompressed();
   }
 
-  @Override
-  public String idNullOr(String prefix, String filterManyExpression) {
-    StringBuilder sb = new StringBuilder(100);
-    sb.append("((");
-    for (int i = 0; i < props.length; i++) {
-      if (i > 0) {
-        sb.append(" and ");
-      }
-      sb.append("${").append(prefix).append('}').append(props[i].dbColumn()).append(" is null");
-    }
-    sb.append(") or (").append(filterManyExpression).append("))");
-    return sb.toString();
-  }
-
   @Override
   public String idSelect() {
     return embIdProperty.name();

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java

@@ -28,11 +28,6 @@ public IdBinderEmpty() {
   public void initialise() {
   }
 
-  @Override
-  public String idNullOr(String name, String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public String idSelect() {
     return "";

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java

@@ -261,9 +261,4 @@ public String cacheKeyFromBean(EntityBean bean) {
     final Object value = idProperty.getValue(bean);
     return scalarType.format(value);
   }
-
-  @Override
-  public String idNullOr(String prefix, String filterManyExpression) {
-    return "(${" + prefix + "}" + idProperty.dbColumn() + " is null or (" + filterManyExpression + "))";
-  }
 }

ebean-core/src/main/java/io/ebeaninternal/server/el/ElPropertyChain.java

@@ -286,8 +286,4 @@ public void pathSet(Object bean, Object value) {
     }
   }
 
-  @Override
-  public String idNullOr(String filterManyExpression) {
-    throw new UnsupportedOperationException();
-  }
 }