Fix for #37 - disjunction expression should not produce inner join - left outer join instead

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

@@ -14,20 +14,30 @@ import com.avaje.ebeaninternal.server.deploy.TableJoin;
 
 /**
  * Join to Many (or child of a many) to support where clause predicates on many properties.
- * 
- * @author rbygrave
  */
 public class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
 
     private final String parentPrefix;
+    
     private final String prefix;
-    private final BeanPropertyAssoc<?> nodeBeanProp;
-    private final SqlTreeNode[] children;
 
-    public SqlTreeNodeManyWhereJoin(String prefix, BeanPropertyAssoc<?> prop) {
+    private final BeanPropertyAssoc<?> nodeBeanProp;
+    
+    /**
+     * Child joins.
+     */
+    private final SqlTreeNode[] children;
+    
+    /**
+     * The many where join which is either INNER or OUTER.
+     */
+    private final SqlJoinType manyJoinType;
+
+    public SqlTreeNodeManyWhereJoin(String prefix, BeanPropertyAssoc<?> prop, SqlJoinType manyJoinType) {
        
         this.nodeBeanProp = prop;
         this.prefix = prefix;
+        this.manyJoinType = manyJoinType;
 
         String[] split = SplitName.split(prefix);
         this.parentPrefix = split[0];
@@ -39,12 +49,15 @@ public class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
     /**
      * Append to the FROM clause for this node.
      */
-    public void appendFrom(DbSqlContext ctx, boolean forceOuterJoin) {
+    @Override
+    public void appendFrom(DbSqlContext ctx, SqlJoinType currentJoinType) {
         
-        appendFromBaseTable(ctx, forceOuterJoin);
+        // always use the join type as per this many where join 
+        // (OUTER for disjunction and otherwise INNER)
+        appendFromBaseTable(ctx, manyJoinType);
         
         for (int i = 0; i < children.length; i++) {
-            children[i].appendFrom(ctx, forceOuterJoin);
+            children[i].appendFrom(ctx, manyJoinType);
         }
     }
 
@@ -52,25 +65,25 @@ public class SqlTreeNodeManyWhereJoin implements SqlTreeNode {
      * Join to base table for this node. This includes a join to the
      * intersection table if this is a ManyToMany node.
      */
-    public void appendFromBaseTable(DbSqlContext ctx, boolean forceOuterJoin) {
+    public void appendFromBaseTable(DbSqlContext ctx, SqlJoinType joinType) {
 
         String alias = ctx.getTableAliasManyWhere(prefix);
         String parentAlias = ctx.getTableAliasManyWhere(parentPrefix);
 
         if (nodeBeanProp instanceof BeanPropertyAssocOne<?>){
-            nodeBeanProp.addInnerJoin(parentAlias, alias, ctx);
+            nodeBeanProp.addJoin(joinType, parentAlias, alias, ctx);
             
         } else {
             BeanPropertyAssocMany<?> manyProp = (BeanPropertyAssocMany<?>)nodeBeanProp;
             if (!manyProp.isManyToMany()) {
-                manyProp.addInnerJoin(parentAlias, alias, ctx);
+                manyProp.addJoin(joinType, parentAlias, alias, ctx);
     
             } else {
                 String alias2 = alias + "z_";
     
                 TableJoin manyToManyJoin = manyProp.getIntersectionTableJoin();
-                manyToManyJoin.addInnerJoin(parentAlias, alias2, ctx);
-                manyProp.addInnerJoin(alias2, alias, ctx);
+                manyToManyJoin.addJoin(joinType, parentAlias, alias2, ctx);
+                manyProp.addJoin(joinType, alias2, alias, ctx);
             }
         }
     }