From 0d8cf53296a4d7c1e6d85c533784a2607bfe3baa Mon Sep 17 00:00:00 2001 From: Jared Armstrong Date: Sat, 17 Mar 2012 00:37:56 +1300 Subject: Allow ActiveRecord::Relation merges to maintain context of joined associations --- .../active_record/associations/join_dependency/join_association.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/associations/join_dependency/join_association.rb') 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 0d7d28e458..ea4856408d 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -55,7 +55,12 @@ module ActiveRecord def find_parent_in(other_join_dependency) other_join_dependency.join_parts.detect do |join_part| - parent == join_part + case parent + when JoinBase + parent.active_record == join_part.active_record + else + parent == join_part + end end end -- cgit v1.2.3