test-case to regressions on uniq hmt with default_scope order.

refs rails#5701
senny · Feb 8, 2013 · a0ec3c4 · a0ec3c4
1 parent bcf0e08
commit a0ec3c4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -901,4 +901,9 @@ def test_has_many_through_with_polymorphic_source
     readers(:michael_authorless).update(first_post_id: 1)
     assert_equal [posts(:thinking)], person.reload.first_posts
   end
+
+  test "has many through with default order scope on the target" do
+    author = authors(:bob)
+    assert_equal [posts(:misc_by_bob)], author.unique_categorized_posts_with_default_sort
+  end
 end
diff --git a/activerecord/test/models/author.rb b/activerecord/test/models/author.rb
@@ -68,6 +68,7 @@ class Author < ActiveRecord::Base
   has_many :unchangable_posts, :class_name => "Post", :before_add => :raise_exception, :after_add => :log_after_adding
 
   has_many :categorizations
+  has_many :ordered_categorizations, :class_name => 'OrderedCategorization'
   has_many :categories, :through => :categorizations
   has_many :named_categories, :through => :categorizations
 
@@ -79,6 +80,7 @@ class Author < ActiveRecord::Base
 
   has_many :categorized_posts, :through => :categorizations, :source => :post
   has_many :unique_categorized_posts, -> { uniq }, :through => :categorizations, :source => :post
+  has_many :unique_categorized_posts_with_default_sort, -> { uniq }, through: :ordered_categorizations, source: :default_scope_post
 
   has_many :nothings, :through => :kateggorisatons, :class_name => 'Category'
 

diff --git a/activerecord/test/models/categorization.rb b/activerecord/test/models/categorization.rb
@@ -17,3 +17,11 @@ class SpecialCategorization < ActiveRecord::Base
   belongs_to :author
   belongs_to :category
 end
+
+class OrderedCategorization < ActiveRecord::Base
+  self.table_name = 'categorizations'
+  default_scope { order('categorizations.category_id') }
+
+  belongs_to :default_scope_post, foreign_key: :post_id, class_name: 'PostWithDefaultScope'
+  belongs_to :author
+end