diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-04 11:54:59 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-09-04 11:54:59 -0300 |
| commit | 40f9407b872add660db45e59316a5a195f16d563 (patch) | |
| tree | fddcabd86b2894279c36fa4e5a1797a87bb1cba6 /activerecord/lib/active_record/associations | |
| parent | 2198a9fc0d2e27f828d452129ce47ad90e16fab7 (diff) | |
| parent | 0b6358beb417f69c47edd93d099906cc818855ee (diff) | |
| download | rails-40f9407b872add660db45e59316a5a195f16d563.tar.gz rails-40f9407b872add660db45e59316a5a195f16d563.tar.bz2 rails-40f9407b872add660db45e59316a5a195f16d563.zip | |
Merge pull request #16801 from eileencodes/refactor-scope_chain-on-through-refelction-to-eliminate-branch-in-eval_scope
Always add lambda to scope chain to eliminate branch in eval_scope
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index 3a0ebba3e4..b965230e60 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -188,11 +188,7 @@ module ActiveRecord end def eval_scope(klass, scope, owner) - if scope.is_a?(Relation) - scope - else - klass.unscoped.instance_exec(owner, &scope) - end + klass.unscoped.instance_exec(owner, &scope) end end end |