#782 - History Many-To-Many Lazy-Loads fail

src/main/java/com/avaje/ebeaninternal/api/SpiQuery.java

@@ -222,6 +222,16 @@ public interface SpiQuery<T> extends Query<T> {
    */
   Timestamp getAsOf();
 
+  /**
+   * Return true if the base table is using history.
+   */
+  boolean isAsOfBaseTable();
+
+  /**
+   * Set when the base table is using history.
+   */
+  void setAsOfBaseTable();
+
   /**
    * Increment the counter of tables used in 'As Of' query.
    */

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java

@@ -1173,6 +1173,13 @@ public class BeanProperty implements ElPropertyValue, Property {
     return excludedFromHistory;
   }
 
+  /**
+   * Return true if this is a ManyToMany with history support (on the intersection table).
+   */
+  public boolean isManyToManyWithHistory() {
+    return !excludedFromHistory && descriptor.isHistorySupport();
+  }
+
   /**
    * Return true if this property only exists on the draft table.
    */

src/main/java/com/avaje/ebeaninternal/server/query/CQueryBuilder.java

@@ -472,8 +472,7 @@ public class CQueryBuilder {
       hasWhere = true;
     }
 
-    int asOfCount = query.getAsOfTableCount();
-    if (asOfCount > 0 && !historySupport.isStandardsBased()) {
+    if (query.isAsOfBaseTable() && !historySupport.isStandardsBased()) {
       hasWhere = appendWhere(hasWhere, sb);
       sb.append(historySupport.getAsOfPredicate(request.getBaseTableAlias()));
     }

src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeBean.java

@@ -507,6 +507,9 @@ public class SqlTreeNodeBean implements SqlTreeNode {
     if (desc.isHistorySupport()) {
       query.incrementAsOfTableCount();
     }
+    if (lazyLoadParent != null && lazyLoadParent.isManyToManyWithHistory()) {
+      query.incrementAsOfTableCount();
+    }
     if (intersectionAsOfTableAlias) {
       query.incrementAsOfTableCount();
     }

src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeRoot.java

@@ -33,6 +33,22 @@ public final class SqlTreeNodeRoot extends SqlTreeNodeBean {
     this.includeJoin = null;
   }
 
+  /**
+   * Set AsOf support (at root level).
+   */
+  public void addAsOfTableAlias(SpiQuery<?> query) {
+    if (desc.isHistorySupport()) {
+      query.setAsOfBaseTable();
+      query.incrementAsOfTableCount();
+    }
+    if (lazyLoadParent != null && lazyLoadParent.isManyToManyWithHistory()) {
+      query.incrementAsOfTableCount();
+    }
+    for (int i = 0; i < children.length; i++) {
+      children[i].addAsOfTableAlias(query);
+    }
+  }
+
   /**
    * For the root node there is no join type or on clause etc.
    */

src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java

@@ -146,6 +146,8 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   private DefaultExpressionList<T> havingExpressions;
 
+  private boolean asOfBaseTable;
+
   private int asOfTableCount;
 
   /**
@@ -280,6 +282,14 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return softDeletePredicates;
   }
 
+  public boolean isAsOfBaseTable() {
+    return asOfBaseTable;
+  }
+
+  public void setAsOfBaseTable() {
+    this.asOfBaseTable = true;
+  }
+
   @Override
   public void incrementAsOfTableCount() {
     asOfTableCount++;