#2145 - SoftDelete predicate missing on join to ManyToOne supporting predicate expression

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

@@ -262,10 +262,16 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
   /**
    * Return true if the target side has soft delete.
    */
+  @Override
   public boolean isTargetSoftDelete() {
     return targetDescriptor.isSoftDelete();
   }
 
+  @Override
+  public String getSoftDeletePredicate(String tableAlias) {
+    return targetDescriptor.getSoftDeletePredicate(tableAlias);
+  }
+
   /**
    * Return true if REFRESH should cascade.
    */

ebean-core/src/main/java/io/ebeaninternal/server/query/STreePropertyAssoc.java

@@ -36,4 +36,13 @@ public interface STreePropertyAssoc extends STreeProperty {
    */
   void setValue(EntityBean parentBean, Object contextBean);
 
+  /**
+   * Return true if the associated type has soft delete.
+   */
+  boolean isTargetSoftDelete();
+
+  /**
+   * Return the soft delete predicate.
+   */
+  String getSoftDeletePredicate(String tableAlias);
 }

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java

@@ -362,7 +362,7 @@ public final class SqlTreeBuilder {
 
     // look for predicateIncludes that are not in selectIncludes and add
     // them as extra joins to the query
-    IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes);
+    IncludesDistiller extraJoinDistill = new IncludesDistiller(desc, selectIncludes, predicateIncludes, temporalMode);
 
     Collection<SqlTreeNodeExtraJoin> extraJoins = extraJoinDistill.getExtraJoinRootNodes();
     if (!extraJoins.isEmpty()) {
@@ -592,26 +592,20 @@ public final class SqlTreeBuilder {
    */
   private static class IncludesDistiller {
 
+    private final STreeType desc;
     private final Set<String> selectIncludes;
     private final Set<String> predicateIncludes;
+    private final SpiQuery.TemporalMode temporalMode;
 
-    /**
-     * Contains the 'root' extra joins. We only return the roots back.
-     */
     private final Map<String, SqlTreeNodeExtraJoin> joinRegister = new HashMap<>();
-
-    /**
-     * Register of all the extra join nodes.
-     */
     private final Map<String, SqlTreeNodeExtraJoin> rootRegister = new HashMap<>();
 
-    private final STreeType desc;
-
     private IncludesDistiller(STreeType desc, Set<String> selectIncludes,
-                              Set<String> predicateIncludes) {
+                              Set<String> predicateIncludes, SpiQuery.TemporalMode temporalMode) {
       this.desc = desc;
       this.selectIncludes = selectIncludes;
       this.predicateIncludes = predicateIncludes;
+      this.temporalMode = temporalMode;
     }
 
     /**
@@ -666,7 +660,7 @@ public final class SqlTreeBuilder {
       if (extra == null) {
         return null;
       } else {
-        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, extra.getProperty(), extra.isContainsMany());
+        SqlTreeNodeExtraJoin extraJoin = new SqlTreeNodeExtraJoin(propertyName, extra.getProperty(), extra.isContainsMany(), temporalMode);
         joinRegister.put(propertyName, extraJoin);
         return extraJoin;
       }

ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java

@@ -24,19 +24,17 @@ import java.util.Set;
 class SqlTreeNodeExtraJoin implements SqlTreeNode {
 
   private final STreePropertyAssoc assocBeanProperty;
-
+  private final SpiQuery.TemporalMode temporalMode;
   private final String prefix;
-
   private final boolean manyJoin;
-
   private final boolean pathContainsMany;
-
   private List<SqlTreeNodeExtraJoin> children;
 
-  SqlTreeNodeExtraJoin(String prefix, STreePropertyAssoc assocBeanProperty, boolean pathContainsMany) {
+  SqlTreeNodeExtraJoin(String prefix, STreePropertyAssoc assocBeanProperty, boolean pathContainsMany, SpiQuery.TemporalMode temporalMode) {
     this.prefix = prefix;
     this.assocBeanProperty = assocBeanProperty;
     this.pathContainsMany = pathContainsMany;
+    this.temporalMode = temporalMode;
     this.manyJoin = assocBeanProperty instanceof STreePropertyAssocMany;
   }
 
@@ -144,15 +142,16 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode {
         assocBeanProperty.appendFrom(ctx, joinType);
       }
       joinType = assocBeanProperty.addJoin(joinType, prefix, ctx);
+      if (assocBeanProperty.isTargetSoftDelete() && temporalMode != SpiQuery.TemporalMode.SOFT_DELETED) {
+        ctx.append(" and ").append(assocBeanProperty.getSoftDeletePredicate(ctx.getTableAlias(prefix)));
+      }
     }
 
     if (children != null) {
-
       if (manyJoin || pathContainsMany) {
         // if AUTO then make all descendants use OUTER JOIN
         joinType = joinType.autoToOuter();
       }
-
       for (SqlTreeNodeExtraJoin child : children) {
         child.appendFrom(ctx, joinType);
       }