diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 21:36:24 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-05-05 21:36:24 +0100 |
| commit | 06c787d2359660529ff5b927d3d34f22379eef00 (patch) | |
| tree | 2fcc97230e0ec2be6bca91465d75b6a434f2b6da /activerecord/lib/active_record/associations/join_dependency/join_association.rb | |
| parent | dcd04e76179611a9db28c9e391aa7d6c2a5b046a (diff) | |
| download | rails-06c787d2359660529ff5b927d3d34f22379eef00.tar.gz rails-06c787d2359660529ff5b927d3d34f22379eef00.tar.bz2 rails-06c787d2359660529ff5b927d3d34f22379eef00.zip | |
Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_association_join_context_on_merge"
This reverts commit dcd04e76179611a9db28c9e391aa7d6c2a5b046a, reversing
changes made to 58a49875df63729f07a9a81d1ee349087d258df5.
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency/join_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency/join_association.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb index ea4856408d..0d7d28e458 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -55,12 +55,7 @@ module ActiveRecord def find_parent_in(other_join_dependency) other_join_dependency.join_parts.detect do |join_part| - case parent - when JoinBase - parent.active_record == join_part.active_record - else - parent == join_part - end + parent == join_part end end |