diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/associations/join_model_test.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/fixtures/author.rb | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/associations/join_model_test.rb b/activerecord/test/associations/join_model_test.rb index 631f7034f4..aaef40ebf1 100644 --- a/activerecord/test/associations/join_model_test.rb +++ b/activerecord/test/associations/join_model_test.rb @@ -539,6 +539,12 @@ class AssociationsJoinModelTest < Test::Unit::TestCase def test_has_many_through_has_many_with_sti assert_equal [comments(:does_it_hurt)], authors(:david).special_post_comments end + + def test_uniq_has_many_through_should_retain_order + comment_ids = authors(:david).comments.map(&:id) + assert_equal comment_ids.sort, authors(:david).ordered_uniq_comments.map(&:id) + assert_equal comment_ids.sort.reverse, authors(:david).ordered_uniq_comments_desc.map(&:id) + end private # create dynamic Post models to allow different dependency options diff --git a/activerecord/test/fixtures/author.rb b/activerecord/test/fixtures/author.rb index d41d8ac439..1503e17f87 100644 --- a/activerecord/test/fixtures/author.rb +++ b/activerecord/test/fixtures/author.rb @@ -18,6 +18,8 @@ class Author < ActiveRecord::Base has_many :comments_desc, :through => :posts, :source => :comments, :order => 'comments.id DESC' has_many :limited_comments, :through => :posts, :source => :comments, :limit => 1 has_many :funky_comments, :through => :posts, :source => :comments + has_many :ordered_uniq_comments, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id' + has_many :ordered_uniq_comments_desc, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id DESC' has_many :special_posts has_many :special_post_comments, :through => :special_posts, :source => :comments |