diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-07-07 02:42:42 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-07-07 02:42:42 +0000 |
| commit | 3fbfc13ee35e074b3efd69c8d6dfeafd461dd43c (patch) | |
| tree | e5026e6053a4faebd98d5dd89f160e4ca4607672 /activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | |
| parent | fd65d89e07d57d809c69043b52a3a1319fb3c2ad (diff) | |
| download | rails-3fbfc13ee35e074b3efd69c8d6dfeafd461dd43c.tar.gz rails-3fbfc13ee35e074b3efd69c8d6dfeafd461dd43c.tar.bz2 rails-3fbfc13ee35e074b3efd69c8d6dfeafd461dd43c.zip | |
Move from select * to select tablename.* to avoid clobbering IDs. Closes #8889 [dasil003]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7167 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index 2155ce8e30..b5f718ae52 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -53,6 +53,7 @@ module ActiveRecord options[:conditions] = conditions options[:joins] = @join_sql options[:readonly] = finding_with_ambigious_select?(options[:select]) + options[:select] ||= '*' if options[:order] && @reflection.options[:order] options[:order] = "#{options[:order]}, #{@reflection.options[:order]}" |