From d4bf5e9b34d8d57be49ac50e31d6ad4151e43947 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Tue, 7 Aug 2007 09:53:33 +0000 Subject: 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 --- .../active_record/associations/has_and_belongs_to_many_association.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb') 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) -- cgit v1.2.3