diff options
| author | Matt Jones <al2o3cr@gmail.com> | 2008-12-02 16:21:21 -0500 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-18 19:19:36 +0000 |
| commit | a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763 (patch) | |
| tree | 27f933f524f033434448fd953cf24285c36d007f /activerecord/lib/active_record/associations/association_collection.rb | |
| parent | 8326b95169ae6af3b81f5596107fef9db4bcbbb0 (diff) | |
| download | rails-a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763.tar.gz rails-a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763.tar.bz2 rails-a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763.zip | |
Fix preloading of has_one :through associations on belongs_to [#1507 state:resolved]
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record/associations/association_collection.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 0ff91fbdf8..0fefec1216 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -83,7 +83,11 @@ module ActiveRecord def to_ary load_target - @target.to_ary + if @target.is_a?(Array) + @target.to_ary + else + Array(@target) + end end def reset |