diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-11 11:06:58 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-11 11:06:58 -0700 |
| commit | cc362fe17b9a3e4be34a6a5a9f97f9c271bd7513 (patch) | |
| tree | 60fff1e0b37d2e193b0bb450e4f17eb31b5236cb /activerecord/lib/active_record | |
| parent | e5f5a838b96a362534d9bb60d02334439ed9784c (diff) | |
| download | rails-cc362fe17b9a3e4be34a6a5a9f97f9c271bd7513.tar.gz rails-cc362fe17b9a3e4be34a6a5a9f97f9c271bd7513.tar.bz2 rails-cc362fe17b9a3e4be34a6a5a9f97f9c271bd7513.zip | |
no reason to do this column addition and subtraction business
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency/join_part.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_part.rb b/activerecord/lib/active_record/associations/join_dependency/join_part.rb index fbc6199f87..d39ce94c99 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_part.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_part.rb @@ -71,7 +71,7 @@ module ActiveRecord unless @column_names_with_alias @column_names_with_alias = [] - ([primary_key] + (column_names - [primary_key])).compact.each_with_index do |column_name, i| + column_names.each_with_index do |column_name, i| @column_names_with_alias << [column_name, "#{aliased_prefix}_r#{i}"] end end |