Fix for deep includes on the same association.

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

3 files changed, 29 insertions, 0 deletions

diff --git a/activerecord/test/associations_cascaded_eager_loading_test.rb b/activerecord/test/associations_cascaded_eager_loading_test.rb
index 642e4fa433..20df8cd30e 100644
--- a/activerecord/test/associations_cascaded_eager_loading_test.rb
+++ b/activerecord/test/associations_cascaded_eager_loading_test.rb
@@ -103,4 +103,9 @@ class CascadedEagerLoadingTest < Test::Unit::TestCase
       authors.first.posts.first.special_comments.first.post.very_special_comment
     end
   end
+  
+  def test_eager_association_loading_with_recursive_cascaded_three_levels
+    root_node = RecursivelyCascadedTreeMixin.find(:first, :include=>{:children=>{:children=>:children}}, :order => 'mixins.id')
+    assert_equal mixins(:recursively_cascaded_tree_4), assert_no_queries { root_node.children.first.children.first.children.first }
+  end
 end
diff --git a/activerecord/test/fixtures/mixin.rb b/activerecord/test/fixtures/mixin.rb
index 78cdbef9b3..afc976f8f1 100644
--- a/activerecord/test/fixtures/mixin.rb
+++ b/activerecord/test/fixtures/mixin.rb
@@ -10,6 +10,10 @@ class TreeMixinWithoutOrder < Mixin
     acts_as_tree :foreign_key => "parent_id"
 end
 
+class RecursivelyCascadedTreeMixin < Mixin
+  acts_as_tree :foreign_key => "parent_id"
+end
+
 class ListMixin < Mixin
   acts_as_list :column => "pos", :scope => :parent
 
diff --git a/activerecord/test/fixtures/mixins.yml b/activerecord/test/fixtures/mixins.yml
index cb21349cd0..d7a0b97295 100644
--- a/activerecord/test/fixtures/mixins.yml
+++ b/activerecord/test/fixtures/mixins.yml
@@ -39,6 +39,26 @@ tree_without_order_2:
   type: TreeMixinWithoutOrder
   parent_id:
 
+recursively_cascaded_tree_1:
+  id: 5005
+  type: RecursivelyCascadedTreeMixin
+  parent_id:
+
+recursively_cascaded_tree_2:
+  id: 5006
+  type: RecursivelyCascadedTreeMixin
+  parent_id: 5005
+
+recursively_cascaded_tree_3:
+  id: 5007
+  type: RecursivelyCascadedTreeMixin
+  parent_id: 5006
+
+recursively_cascaded_tree_4:
+  id: 5008
+  type: RecursivelyCascadedTreeMixin
+  parent_id: 5007
+
 # List mixins
 
 <% (1..4).each do |counter| %>