Quit ignoring default :include options in has_many :through calls [Mark James]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3974 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 28 insertions, 3 deletions

diff --git a/activerecord/test/associations_join_model_test.rb b/activerecord/test/associations_join_model_test.rb
index 4ea2b6e684..d7a230ddba 100644
--- a/activerecord/test/associations_join_model_test.rb
+++ b/activerecord/test/associations_join_model_test.rb
@@ -36,9 +36,34 @@ class AssociationsJoinModelTest < Test::Unit::TestCase
   end
 
   def test_polymorphic_has_many_going_through_join_model
-    assert_equal tags(:general), posts(:welcome).tags.first
+    assert_equal tags(:general), tag = posts(:welcome).tags.first
+    assert_no_queries do
+      tag.tagging
+    end
+  end
+
+  def test_polymorphic_has_many_going_through_join_model_with_find
+    assert_equal tags(:general), tag = posts(:welcome).tags.find(:first)
+    assert_no_queries do
+      tag.tagging
+    end
   end
 
+  def test_polymorphic_has_many_going_through_join_model_with_include_on_source_reflection
+    assert_equal tags(:general), tag = posts(:welcome).funky_tags.first
+    assert_no_queries do
+      tag.tagging
+    end
+  end
+
+  def test_polymorphic_has_many_going_through_join_model_with_include_on_source_reflection_with_find
+    assert_equal tags(:general), tag = posts(:welcome).funky_tags.find(:first)
+    assert_no_queries do
+      tag.tagging
+    end
+  end
+
+
   def test_polymorphic_has_many_going_through_join_model_with_custom_foreign_key
     assert_equal tags(:misc), taggings(:welcome_general).super_tag
     assert_equal tags(:misc), posts(:welcome).super_tags.first
diff --git a/activerecord/test/fixtures/post.rb b/activerecord/test/fixtures/post.rb
index eca9369723..d3fa126b88 100644
--- a/activerecord/test/fixtures/post.rb
+++ b/activerecord/test/fixtures/post.rb
@@ -21,7 +21,7 @@ class Post < ActiveRecord::Base
   has_and_belongs_to_many :special_categories, :join_table => "categories_posts", :association_foreign_key => 'category_id'
 
   has_many :taggings, :as => :taggable
-  has_many :tags, :through => :taggings
+  has_many :tags, :through => :taggings, :include => :tagging
   has_many :funky_tags, :through => :taggings, :class_name => 'Tag'
   has_many :super_tags, :through => :taggings
   has_one :tagging, :as => :taggable
diff --git a/activerecord/test/fixtures/tagging.rb b/activerecord/test/fixtures/tagging.rb
index 51c3bd3604..4695f0755e 100644
--- a/activerecord/test/fixtures/tagging.rb
+++ b/activerecord/test/fixtures/tagging.rb
@@ -1,5 +1,5 @@
 class Tagging < ActiveRecord::Base
-  belongs_to :tag
+  belongs_to :tag, :include => :tagging
   belongs_to :super_tag,   :class_name => 'Tag', :foreign_key => 'super_tag_id'
   belongs_to :invalid_tag, :class_name => 'Tag', :foreign_key => 'tag_id'
   belongs_to :taggable, :polymorphic => true, :counter_cache => true