diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-14 14:49:33 -0800 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2010-12-16 01:49:29 +0530 |
| commit | 80ff64a947b4acd3835faab36e3b7f44ade10170 (patch) | |
| tree | 991b1c09a7a1bc3c5ce39f64aff737bebbe59055 /activerecord | |
| parent | b68407f7f013ce3b08d1273ac3c2ffd7a8a510c9 (diff) | |
| download | rails-80ff64a947b4acd3835faab36e3b7f44ade10170.tar.gz rails-80ff64a947b4acd3835faab36e3b7f44ade10170.tar.bz2 rails-80ff64a947b4acd3835faab36e3b7f44ade10170.zip | |
just copy the joins to the list
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index d0c8af1801..6ad51e2fb4 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -54,7 +54,7 @@ module ActiveRecord end def construct_find_options!(options) - options[:joins] = construct_joins(options[:joins]) + options[:joins] = [construct_joins] + Array.wrap(options[:joins]) options[:include] = @reflection.source_reflection.options[:include] if options[:include].nil? && @reflection.source_reflection.options[:include] end |