From 5b83f46a1907f258cae044f8d2e83a7fae15b7b5 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 16 Jul 2013 11:36:59 -0700 Subject: use Relation#merge to combine scope chain items --- .../associations/join_dependency/join_association.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (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 d1bc64adf6..97956ea3a1 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -114,12 +114,12 @@ module ActiveRecord scope_chain_items.concat [reflection.klass.send(:build_default_scope)].compact - constraint = scope_chain_items.inject(constraint) do |chain, item| - if item.arel.constraints.empty? - chain - else - chain.and(item.arel.constraints) - end + rel = scope_chain_items.inject(scope_chain_items.shift) do |left, right| + left.merge right + end + + if rel && !rel.arel.constraints.empty? + constraint = constraint.and rel.arel.constraints end manager.from(join(table, constraint)) -- cgit v1.2.3