diff options
author | Michael Koziarski <michael@koziarski.com> | 2007-08-07 09:53:33 +0000 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2007-08-07 09:53:33 +0000 |
commit | d4bf5e9b34d8d57be49ac50e31d6ad4151e43947 (patch) | |
tree | 984f5e82d68a3766c532ca6d1039e93c3fb777ca /activerecord/lib/active_record/associations | |
parent | bb94ce92fc1486f7a3d2077e073dd50ce758567d (diff) | |
download | rails-d4bf5e9b34d8d57be49ac50e31d6ad4151e43947.tar.gz rails-d4bf5e9b34d8d57be49ac50e31d6ad4151e43947.tar.bz2 rails-d4bf5e9b34d8d57be49ac50e31d6ad4151e43947.zip |
Make habtm respect the :select option. Closes #9207. [Aleksey Kondratenko]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7279 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb | 3 |
1 files changed, 2 insertions, 1 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 d06af335ef..aebe521ca0 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,7 +53,6 @@ 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]}" @@ -63,6 +62,8 @@ module ActiveRecord merge_options_from_reflection!(options) + options[:select] ||= '*' + # Pass through args exactly as we received them. args << options @reflection.klass.find(*args) |