diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-24 08:49:10 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-09-24 08:50:22 -0600 |
| commit | 4a375a83deab7a3089e718a1d18ddc4c2846cd40 (patch) | |
| tree | ece41e5e5551fb21db2849dc1b80b6ba8a159219 /activerecord/lib/active_record | |
| parent | 3ae76f553f03b6233e7ec1520debac09bf13612e (diff) | |
| parent | d25321b35328742ab97c08e7b1ed3cadeca5739b (diff) | |
| download | rails-4a375a83deab7a3089e718a1d18ddc4c2846cd40.tar.gz rails-4a375a83deab7a3089e718a1d18ddc4c2846cd40.tar.bz2 rails-4a375a83deab7a3089e718a1d18ddc4c2846cd40.zip | |
Merge pull request #21550 from didacte/unscope-associations
ActiveRecord: use association's `unscope` when preloading
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 1dc8bff193..92792a7a15 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -154,7 +154,7 @@ module ActiveRecord scope.where!(klass.table_name => { reflection.type => model.base_class.sti_name }) end - scope.unscope_values = Array(values[:unscope]) + scope.unscope_values = Array(values[:unscope]) + Array(preload_values[:unscope]) klass.default_scoped.merge(scope) end end |