diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-11-05 15:03:35 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-11-05 15:13:23 +0100 |
| commit | 8e9cb9787bab976fa3a9a7722c5a024dc8384de4 (patch) | |
| tree | ca02ecb6123675b73c62993ea80acfc540199fda /activerecord/lib/active_record | |
| parent | 8d902a949b2ca6695766263756bdd274cf4988d8 (diff) | |
| parent | 0f3cefa445c6b43711b29f38257adcedede74baa (diff) | |
| download | rails-8e9cb9787bab976fa3a9a7722c5a024dc8384de4.tar.gz rails-8e9cb9787bab976fa3a9a7722c5a024dc8384de4.tar.bz2 rails-8e9cb9787bab976fa3a9a7722c5a024dc8384de4.zip | |
Merge pull request #17360 from bronzle/includes_and_unscoped
copy reflection_scopes’s unscoped value when building scope for preloading
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index c0639742be..496c426986 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -159,6 +159,7 @@ module ActiveRecord scope.where!(klass.table_name => { reflection.type => model.base_class.sti_name }) end + scope.unscope_values = Array(values[:unscope]) klass.default_scoped.merge(scope) end end |