diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-15 13:00:53 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-15 13:00:53 -0200 |
| commit | 7f4975ffc618bc3125039c565507a385c1187183 (patch) | |
| tree | 2f5e8dece8f9be3fc1e7c6d20d00815ac5bf0e29 /activerecord/lib/active_record | |
| parent | de83b017a90e9fe68da1359a97ac5b58b7c0f3fe (diff) | |
| download | rails-7f4975ffc618bc3125039c565507a385c1187183.tar.gz rails-7f4975ffc618bc3125039c565507a385c1187183.tar.bz2 rails-7f4975ffc618bc3125039c565507a385c1187183.zip | |
Revert "Merge pull request #9252 from senny/8423_hmt_preloading_bug"
This reverts commit c5451777b038c5e48567f69256986ae42a2cde48.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/through_association.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index 0f1336bd00..ad6374d09a 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -37,8 +37,7 @@ module ActiveRecord through_records = Array.wrap(owner.send(through_reflection.name)) # Dont cache the association - we would only be caching a subset - if (through_scope != through_reflection.klass.unscoped) || - (reflection.options[:source_type] && through_reflection.collection?) + if reflection.options[:source_type] && through_reflection.collection? owner.association(through_reflection.name).reset end |