diff options
author | Rick Olson <technoweenie@gmail.com> | 2008-03-26 15:40:57 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2008-03-26 15:40:57 +0000 |
commit | c366515abdecf750adfba574be89e8ec43c8553e (patch) | |
tree | 4fc55c98b920a7068572d79f3da5328ec6685628 /activerecord | |
parent | 1648208ab09277467220efc92a532994024eea78 (diff) | |
download | rails-c366515abdecf750adfba574be89e8ec43c8553e.tar.gz rails-c366515abdecf750adfba574be89e8ec43c8553e.tar.bz2 rails-c366515abdecf750adfba574be89e8ec43c8553e.zip |
Fix issue where the :uniq option of a has_many :through association is ignored when find(:all) is called. Closes #9407 [cavalle]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9096 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_through_association.rb | 8 | ||||
-rw-r--r-- | activerecord/test/cases/associations/join_model_test.rb | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 16dfaa0518..fe14ecd0f8 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix issue where the :uniq option of a has_many :through association is ignored when find(:all) is called. Closes #9407 [cavalle] + * Fix duplicate table alias error when including an association with a has_many :through association on the same join table. Closes #7310 [cavalle] * More efficient association preloading code that compacts a through_records array in a central location. Closes #11427 [danger] 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) diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb index 3d59b97f70..d4db4ef770 100644 --- a/activerecord/test/cases/associations/join_model_test.rb +++ b/activerecord/test/cases/associations/join_model_test.rb @@ -41,6 +41,14 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase assert_queries(1) { assert_equal 0, author.unique_categorized_posts.count(:title, :conditions => "title is NULL") } assert !authors(:mary).unique_categorized_posts.loaded? end + + def test_has_many_uniq_through_find + assert_equal 1, authors(:mary).unique_categorized_posts.find(:all).size + end + + def test_has_many_uniq_through_dynamic_find + assert_equal 1, authors(:mary).unique_categorized_posts.find_all_by_title("So I was thinking").size + end def test_polymorphic_has_many assert posts(:welcome).taggings.include?(taggings(:welcome_general)) |