diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-05-31 16:11:43 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2017-05-31 17:51:38 +0900 |
| commit | c11109da934d71b1d0a139da36e52423844fa36e (patch) | |
| tree | e4b733a72cae63606a6026247a10a9816fc22a93 /activerecord/lib | |
| parent | 7c800fe5e338540ef195f071a7f3604ed4197f3f (diff) | |
| download | rails-c11109da934d71b1d0a139da36e52423844fa36e.tar.gz rails-c11109da934d71b1d0a139da36e52423844fa36e.tar.bz2 rails-c11109da934d71b1d0a139da36e52423844fa36e.zip | |
Fix `default_scoped` with defined `default_scope` on STI model
This regression is caused by d1249c1.
If STI model is defined `default_scope`, `base_rel` is not respected.
I fixed to merge `base_rel` in that case.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/scoping/default.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/scoping/default.rb b/activerecord/lib/active_record/scoping/default.rb index ba5cc29ac1..70b2693b28 100644 --- a/activerecord/lib/active_record/scoping/default.rb +++ b/activerecord/lib/active_record/scoping/default.rb @@ -107,7 +107,11 @@ module ActiveRecord if default_scope_override # The user has defined their own default scope method, so call that - evaluate_default_scope { default_scope } + evaluate_default_scope do + if scope = default_scope + (base_rel ||= relation).merge(scope) + end + end elsif default_scopes.any? base_rel ||= relation evaluate_default_scope do |