diff options
| author | Agis- <corestudiosinc@gmail.com> | 2014-07-15 03:25:18 +0300 |
|---|---|---|
| committer | Agis- <corestudiosinc@gmail.com> | 2014-08-20 08:25:58 +0300 |
| commit | 431f8e01196044877c2acea4271410b1033ec915 (patch) | |
| tree | 82a5a15529f75967a30d601eaa2099b6e1f4c8cf /activerecord/lib/active_record/associations/through_association.rb | |
| parent | 7422d2175d72f3e32f48f52ae4101cf4b6297c39 (diff) | |
| download | rails-431f8e01196044877c2acea4271410b1033ec915.tar.gz rails-431f8e01196044877c2acea4271410b1033ec915.tar.bz2 rails-431f8e01196044877c2acea4271410b1033ec915.zip | |
Only merge scopes with zero arity in has_many through
with dynamic conditions.
Fixes #16128
This bug was introduced in https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d
so it's present from 4.1.2-rc1 and after.
https://github.com/rails/rails/commit/c35e438620f2d56562251571377995359546393d
merges any relation scopes passed as proc objects to the relation,
but does *not* take into account the arity of the lambda.
To reproduce: https://gist.github.com/Agis-/5f1f0d664d2cd08dfb9b
Diffstat (limited to 'activerecord/lib/active_record/associations/through_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index 611d471e62..e47e81aa0f 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -15,7 +15,11 @@ module ActiveRecord scope = super reflection.chain.drop(1).each do |reflection| relation = reflection.klass.all - relation.merge!(reflection.scope) if reflection.scope + + reflection_scope = reflection.scope + if reflection_scope && reflection_scope.arity.zero? + relation.merge!(reflection_scope) + end scope.merge!( relation.except(:select, :create_with, :includes, :preload, :joins, :eager_load) |