diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-15 11:33:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-15 14:18:15 -0700 |
| commit | 55736ef1252a7373c3c21b9cb0bebf497fddaff9 (patch) | |
| tree | 27d94e9d2a41e028ef1e589e442bccc3cb49d6dc /activerecord/lib | |
| parent | eeb324699169ad52d7e771ded20310afce62927d (diff) | |
| download | rails-55736ef1252a7373c3c21b9cb0bebf497fddaff9.tar.gz rails-55736ef1252a7373c3c21b9cb0bebf497fddaff9.tar.bz2 rails-55736ef1252a7373c3c21b9cb0bebf497fddaff9.zip | |
@join_values is passed in, so we should use the parameter
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index de57725af2..91d26e705e 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -222,7 +222,7 @@ module ActiveRecord def build_joins(relation, joins) association_joins = [] - joins = @joins_values.map {|j| j.respond_to?(:strip) ? j.strip : j}.uniq + joins = joins.map {|j| j.respond_to?(:strip) ? j.strip : j}.uniq joins.each do |join| association_joins << join if [Hash, Array, Symbol].include?(join.class) && !array_of_strings?(join) |