Merge pull request #7792 from seejee/chained_scopes_preload_properly

Fixes Issue #7490: Chained scopes will preload properly

2 files changed, 10 insertions, 0 deletions

diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index ada4294401..98fe6b7611 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -332,6 +332,13 @@ class RelationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_preload_applies_to_all_chained_preloaded_scopes
+    assert_queries(3) do
+      post = Post.with_tags.with_comments.first
+      assert post
+    end
+  end
+
   def test_find_with_included_associations
     assert_queries(2) do
       posts = Post.includes(:comments).order('posts.id')
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 9aa02fa18f..3cfd1a0f76 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -76,6 +76,9 @@ class Post < ActiveRecord::Base
     end
   end
 
+  scope :with_comments, preload(:comments)
+  scope :with_tags, preload(:taggings)
+
   has_many :interpolated_taggings, :class_name => 'Tagging', :as => :taggable, :conditions => proc { "1 = #{1}" }
   has_many :interpolated_tags, :through => :taggings
   has_many :interpolated_tags_2, :through => :interpolated_taggings, :source => :tag