Permalink
Browse files

Merge pull request #13525 from huoxito/make-outer-joins-on-proper-parent

Make outer joins on proper parent
  • Loading branch information...
2 parents f3a8be3 + 8e1f26c commit b953b2fc464a31dfd040de126030ac05e18f6e4c @rafaelfranca rafaelfranca committed Dec 31, 2013
@@ -114,7 +114,7 @@ def join_constraints(outer_joins)
walk join_root, oj.join_root
else
oj.join_root.children.flat_map { |child|
- make_outer_joins join_root, child
+ make_outer_joins oj.join_root, child
}
end
}
@@ -207,6 +207,17 @@ def test_relation_merging_with_merged_joins_as_symbols
assert_equal 3, authors(:david).posts.merge(posts_with_special_comments_with_ratings).count.length
end
+ def test_relation_merging_with_joins_as_join_dependency_pick_proper_parent
+ post = Post.create!(title: "haha", body: "huhu")
+ comment = post.comments.create!(body: "hu")
+ 3.times { comment.ratings.create! }
+
+ relation = Post.joins Associations::JoinDependency.new(Post, :comments, [])
+ relation = relation.joins Associations::JoinDependency.new(Comment, :ratings, [])
+
+ assert_equal 3, relation.pluck(:id).select { |id| id == post.id }.count
+ end
+
def test_respond_to_for_non_selected_element
post = Post.select(:title).first
assert_equal false, post.respond_to?(:body), "post should not respond_to?(:body) since invoking it raises exception"
@@ -221,6 +232,5 @@ def test_relation_merging_with_merged_joins_as_strings
posts_with_special_comments_with_ratings = Post.group("posts.id").joins(:special_comments).merge(special_comments_with_ratings)
assert_equal 3, authors(:david).posts.merge(posts_with_special_comments_with_ratings).count.length
end
-
end
end

1 comment on commit b953b2f

Contributor

jonatack commented on b953b2f Jan 1, 2014

👍

Please sign in to comment.