Merge pull request #29601 from kamipo/fix_eager_loading_to_respect_store_full_sti_class

Fix eager loading to respect `store_full_sti_class` setting

3 files changed, 22 insertions, 11 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index bbf23c90df..7e8ca51f25 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Fix eager loading to respect `store_full_sti_class` setting.
+
+    *Ryuta Kamizono*
+
 *   Query cache was unavailable when entering the ActiveRecord::Base.cache block
     without being connected.
 
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 3d3ec862a3..72e0fcbdf4 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -200,7 +200,7 @@ module ActiveRecord
         end
 
         if type
-          klass_scope.where!(type => foreign_klass.base_class.name)
+          klass_scope.where!(type => foreign_klass.base_class.sti_name)
         end
 
         scope_chain_items.inject(klass_scope, &:merge!)
diff --git a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
index 4f0fe3236e..61f39b4136 100644
--- a/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
+++ b/activerecord/test/cases/associations/eager_load_includes_full_sti_class_test.rb
@@ -11,25 +11,32 @@ end
 
 class EagerLoadIncludeFullStiClassNamesTest < ActiveRecord::TestCase
   def setup
-    generate_test_objects
-  end
-
-  def generate_test_objects
     post = Namespaced::Post.create(title: "Great stuff", body: "This is not", author_id: 1)
-    Tagging.create(taggable: post)
+    @tagging = Tagging.create(taggable: post)
+    @old = ActiveRecord::Base.store_full_sti_class
   end
 
-  def test_class_names
-    old = ActiveRecord::Base.store_full_sti_class
+  def teardown
+    ActiveRecord::Base.store_full_sti_class = @old
+  end
 
+  def test_class_names_with_includes
     ActiveRecord::Base.store_full_sti_class = false
     post = Namespaced::Post.includes(:tagging).find_by_title("Great stuff")
     assert_nil post.tagging
 
     ActiveRecord::Base.store_full_sti_class = true
     post = Namespaced::Post.includes(:tagging).find_by_title("Great stuff")
-    assert_instance_of Tagging, post.tagging
-  ensure
-    ActiveRecord::Base.store_full_sti_class = old
+    assert_equal @tagging, post.tagging
+  end
+
+  def test_class_names_with_eager_load
+    ActiveRecord::Base.store_full_sti_class = false
+    post = Namespaced::Post.eager_load(:tagging).find_by_title("Great stuff")
+    assert_nil post.tagging
+
+    ActiveRecord::Base.store_full_sti_class = true
+    post = Namespaced::Post.eager_load(:tagging).find_by_title("Great stuff")
+    assert_equal @tagging, post.tagging
   end
 end