diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-09-06 16:34:32 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-09-06 16:34:32 +0100 |
| commit | 9bde73ff72812f6f3c59ad97be6ca6c628e109ea (patch) | |
| tree | c3f6c81e620b5862f6b2d4519471dd22e738b8da /activerecord/lib | |
| parent | b24d668859c5836c0e3ed277b2022a1a39eb3f8e (diff) | |
| download | rails-9bde73ff72812f6f3c59ad97be6ca6c628e109ea.tar.gz rails-9bde73ff72812f6f3c59ad97be6ca6c628e109ea.tar.bz2 rails-9bde73ff72812f6f3c59ad97be6ca6c628e109ea.zip | |
Nested through associations: preloads from the default scope of a through model should not be included in the association scope. (We're already excluding includes.) Fixes #2834.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb index 81172179e0..b010b5e9ef 100644 --- a/activerecord/lib/active_record/associations/through_association.rb +++ b/activerecord/lib/active_record/associations/through_association.rb @@ -16,7 +16,7 @@ module ActiveRecord chain[1..-1].each do |reflection| scope = scope.merge( reflection.klass.scoped.with_default_scope. - except(:select, :create_with, :includes) + except(:select, :create_with, :includes, :preload) ) end scope |