diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-13 12:16:53 +0100 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-10-13 08:24:19 -0700 |
| commit | 19304a9758ac4b98a0b98b5849eeb6ffdac028f4 (patch) | |
| tree | eb5aa13f406c8a25a669085b71c0ba8de949d505 /activerecord/lib/active_record/relation/finder_methods.rb | |
| parent | 7dcb6334271aaecf53cbe99fe6f354a351bde210 (diff) | |
| download | rails-19304a9758ac4b98a0b98b5849eeb6ffdac028f4.tar.gz rails-19304a9758ac4b98a0b98b5849eeb6ffdac028f4.tar.bz2 rails-19304a9758ac4b98a0b98b5849eeb6ffdac028f4.zip | |
Renaming and formatting changes in JoinDependency
Diffstat (limited to 'activerecord/lib/active_record/relation/finder_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/finder_methods.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb index e950dce62b..b763e22ec6 100644 --- a/activerecord/lib/active_record/relation/finder_methods.rb +++ b/activerecord/lib/active_record/relation/finder_methods.rb @@ -343,8 +343,11 @@ module ActiveRecord end def column_aliases(join_dependency) - join_dependency.joins.collect{|join| join.column_names_with_alias.collect{|column_name, aliased_name| - "#{connection.quote_table_name join.aliased_table_name}.#{connection.quote_column_name column_name} AS #{aliased_name}"}}.flatten.join(", ") + join_dependency.join_parts.collect { |join_part| + join_part.column_names_with_alias.collect{ |column_name, aliased_name| + "#{connection.quote_table_name join_part.aliased_table_name}.#{connection.quote_column_name column_name} AS #{aliased_name}" + } + }.flatten.join(", ") end def using_limitable_reflections?(reflections) |