diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-16 11:36:59 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-07-16 11:36:59 -0700 |
| commit | 5b83f46a1907f258cae044f8d2e83a7fae15b7b5 (patch) | |
| tree | df21702159e8380d557ac0ab691b3213ba2fe1ff /activerecord/lib/active_record/associations/join_dependency/join_association.rb | |
| parent | e70da0e1a37ca396028f24816ea2198a06df25c0 (diff) | |
| download | rails-5b83f46a1907f258cae044f8d2e83a7fae15b7b5.tar.gz rails-5b83f46a1907f258cae044f8d2e83a7fae15b7b5.tar.bz2 rails-5b83f46a1907f258cae044f8d2e83a7fae15b7b5.zip | |
use Relation#merge to combine scope chain items
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 | 12 |
1 files changed, 6 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 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)) |