From d9147327c1aeb6c1ecc7f5b621f6f6e9fb7ec3a7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 11 Jan 2017 23:21:50 +1300 Subject: [PATCH] #944 - Incorrect join (should be outer join) when predicate only path traverses an optional relationship to a mandatory relationship --- .../server/query/SqlTreeNodeExtraJoin.java | 2 +- .../tests/query/TestJoinOptOneCascade.java | 25 ++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java index 71a06be0a..91dafdca3 100644 --- a/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java +++ b/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java @@ -124,7 +124,7 @@ class SqlTreeNodeExtraJoin implements SqlTreeNode { joinType = SqlJoinType.OUTER; } if (!manyToMany) { - assocBeanProperty.addJoin(joinType, prefix, ctx); + joinType = assocBeanProperty.addJoin(joinType, prefix, ctx); } if (children != null) { diff --git a/src/test/java/org/tests/query/TestJoinOptOneCascade.java b/src/test/java/org/tests/query/TestJoinOptOneCascade.java index c6debf27a..881117d75 100644 --- a/src/test/java/org/tests/query/TestJoinOptOneCascade.java +++ b/src/test/java/org/tests/query/TestJoinOptOneCascade.java @@ -3,9 +3,10 @@ package org.tests.query; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Query; -import org.tests.model.basic.EOptOneA; -import org.junit.Assert; import org.junit.Test; +import org.tests.model.basic.EOptOneA; + +import static org.assertj.core.api.Assertions.assertThat; public class TestJoinOptOneCascade extends BaseTestCase { @@ -18,8 +19,24 @@ public class TestJoinOptOneCascade extends BaseTestCase { query.findList(); String sql = query.getGeneratedSql(); - Assert.assertTrue(sql.contains("left join eopt_one_b ")); - Assert.assertTrue(sql.contains("left join eopt_one_c ")); + assertThat(sql).contains("left join eopt_one_b "); + assertThat(sql).contains("left join eopt_one_c "); } + + @Test + public void test_where() { + + // the left join cascades to the join for c + Query query = Ebean.find(EOptOneA.class) + .where() + .eq("b.c.nameForC", "foo") + .query(); + + query.findList(); + String sql = query.getGeneratedSql(); + + assertThat(sql).contains("left join eopt_one_b "); + assertThat(sql).contains("left join eopt_one_c "); + } }