diff options
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb index 700a4bf89c..083646f793 100644 --- a/activerecord/lib/active_record/associations/has_many_through_association.rb +++ b/activerecord/lib/active_record/associations/has_many_through_association.rb @@ -153,7 +153,7 @@ module ActiveRecord end def find_target - records = @reflection.klass.find(:all, + @reflection.klass.find(:all, :select => construct_select, :conditions => construct_conditions, :from => construct_from, @@ -164,9 +164,6 @@ module ActiveRecord :readonly => @reflection.options[:readonly], :include => @reflection.options[:include] || @reflection.source_reflection.options[:include] ) - - records.uniq! if @reflection.options[:uniq] - records end # Construct attributes for associate pointing to owner. @@ -215,7 +212,8 @@ module ActiveRecord end def construct_select(custom_select = nil) - selected = custom_select || @reflection.options[:select] || "#{@reflection.quoted_table_name}.*" + distinct = "DISTINCT " if @reflection.options[:uniq] + selected = custom_select || @reflection.options[:select] || "#{distinct}#{@reflection.quoted_table_name}.*" end def construct_joins(custom_joins = nil) |