diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-22 02:20:37 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-22 02:20:37 +0000 |
| commit | 5c1be2812ddc81a3ac5b65c8a461a9622e41b31c (patch) | |
| tree | b97565500852ab3994059b455725225d3d6bd2f0 /activerecord/lib/active_record/association_preload.rb | |
| parent | f921a96e8506ca5d376a83f06b45ffd8df737fa7 (diff) | |
| download | rails-5c1be2812ddc81a3ac5b65c8a461a9622e41b31c.tar.gz rails-5c1be2812ddc81a3ac5b65c8a461a9622e41b31c.tar.bz2 rails-5c1be2812ddc81a3ac5b65c8a461a9622e41b31c.zip | |
has_one :through supports :source_type. Fix up some tests. References #4756.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9075 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/association_preload.rb')
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 0c31c85bb0..ad9b9d6488 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -165,8 +165,13 @@ module ActiveRecord through_records = [] records.compact.each do |record| proxy = record.send(through_association) - through_records << proxy.target - proxy.reset + + if proxy.respond_to?(:target) + through_records << proxy.target + proxy.reset + else # this is a has_one :through reflection + through_records << proxy if proxy + end end through_records = through_records.flatten else |