Ticket #8267: multiple_table_references_on_cascaded_eager_loading_fix.diff

activerecord/test/associations/join_model_test.rb

@@ -483 +483 @@
-  def test_has_many_through_has_many_with_sti
-    assert_equal [comments(:does_it_hurt)], authors(:david).special_post_comments
-  end
+  
+  def test_multiple_table_references_on_cascaded_eager_loading
+    assert_equal comments(:greetings), authors(:david).comments_with_cited_posts.find(:all, :order => 'comments.id').first
+  end
-
-  private
-    # create dynamic Post models to allow different dependency options

activerecord/test/fixtures/comment.rb

@@ -1 +1 @@
-class Comment < ActiveRecord::Base
-  belongs_to :post
+  has_many :post_citations
-  
-  def self.what_are_you
-    'a comment...'
@@ -20 +21 @@
-  def self.what_are_you
-    'a very special comment...'
-  end
+end
+
+class PostCitation < ActiveRecord::Base
+  belongs_to :comment
+  belongs_to :post
-end

activerecord/test/fixtures/db_definitions/schema.rb

@@ -39 +39 @@
-    t.column :author_id, :integer
-    t.column :favorite_author_id, :integer
-  end
+  
+  create_table :post_citations, :force => true do |t|
+    t.column :comment_id, :integer
+    t.column :post_id, :integer
+  end
-
-  create_table :vertices, :force => true do |t|
-    t.column :label, :string

activerecord/test/fixtures/post.rb

@@ -12 +12 @@
-      find(:first, :order => "id DESC")
-    end
-  end
+  
+  has_many :comments_with_cited_posts, :class_name => "Comment", :include => {:post_citations => :post}
-
-  has_one  :very_special_comment
-  has_one  :very_special_comment_with_post, :class_name => "VerySpecialComment", :include => :post

activerecord/test/fixtures/author.rb

@@ -16 +16 @@
-  end
-  has_many :comments, :through => :posts
-  has_many :funky_comments, :through => :posts, :source => :comments
+  has_many :comments_with_cited_posts, :through => :posts
-
-  has_many :special_posts
-  has_many :special_post_comments, :through => :special_posts, :source => :comments

activerecord/lib/active_record/associations.rb

@@ -1527 +1527 @@
-              @aliased_table_name = table_name #.tr('.', '_') # start with the table name, sub out any .'s
-              @parent_table_name  = parent.active_record.table_name
-
-parent.table_joins.blank? && parent
+join_dependency.join_base.table_joins.blank? && join_dependency.join_base
-                join_dependency.table_aliases[aliased_table_name] += 1
-              end
-