diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-07-19 08:23:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 08:23:39 -0400 |
| commit | 01429a665c1eadd20a64ca25d36190a9d9b555b1 (patch) | |
| tree | eb66658e4443dbc76dbf1348badc39b7b1ff1ce5 /activerecord/lib | |
| parent | 04d5e08c13303b2ade8dba4097dffe31641ba6c9 (diff) | |
| parent | 1173c7cad3684048c53f2ef9a5c936d9e58e75d0 (diff) | |
| download | rails-01429a665c1eadd20a64ca25d36190a9d9b555b1.tar.gz rails-01429a665c1eadd20a64ca25d36190a9d9b555b1.tar.bz2 rails-01429a665c1eadd20a64ca25d36190a9d9b555b1.zip | |
Merge pull request #33394 from kamipo/avoid_extra_scoping
Avoid extra scoping in delegating to klass methods in the `scope` block
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 7ab9bb2d2d..fce5b66719 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -309,10 +309,10 @@ module ActiveRecord # Please check unscoped if you want to remove all previous scopes (including # the default_scope) during the execution of a block. def scoping - previous, klass.current_scope = klass.current_scope(true), self + previous, klass.current_scope = klass.current_scope(true), self unless @delegate_to_klass yield ensure - klass.current_scope = previous + klass.current_scope = previous unless @delegate_to_klass end def _exec_scope(*args, &block) # :nodoc: |