aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-06-28 14:42:55 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-06-28 14:42:55 -0400
commit316e3c2ff1ff6efb2d1cf43cae1cbd4bf93cf16e (patch)
treeee1623906b8e0fbe1015784715354ea868b02d34 /activerecord/lib
parent33de72667a026f8a9c188189bcc191976a7c397a (diff)
parentb084fe9054759263329cfe36f2d4de13567d67f6 (diff)
downloadrails-316e3c2ff1ff6efb2d1cf43cae1cbd4bf93cf16e.tar.gz
rails-316e3c2ff1ff6efb2d1cf43cae1cbd4bf93cf16e.tar.bz2
rails-316e3c2ff1ff6efb2d1cf43cae1cbd4bf93cf16e.zip
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
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/reflection.rb2
1 files changed, 1 insertions, 1 deletions
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!)