From b04051d4e0c8066ec79cd4978606e4728dfa6ffa Mon Sep 17 00:00:00 2001 From: Dmitry Vorotilin Date: Fri, 1 Mar 2013 02:32:38 +0400 Subject: Fix ActiveRecord `subclass_from_attrs` when eager_load is false. It cannot find subclass because all classes are loaded automatically when it needs. --- activerecord/lib/active_record/inheritance.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb index e630897a4b..e4586f74fc 100644 --- a/activerecord/lib/active_record/inheritance.rb +++ b/activerecord/lib/active_record/inheritance.rb @@ -167,8 +167,9 @@ module ActiveRecord # this will ignore the inheritance column and return nil def subclass_from_attrs(attrs) subclass_name = attrs.with_indifferent_access[inheritance_column] - return nil if subclass_name.blank? || subclass_name == self.name - unless subclass = subclasses.detect { |sub| sub.name == subclass_name } + return if subclass_name.blank? || subclass_name == self.name + subclass = subclass_name.safe_constantize + unless subclasses.include?(subclass) raise ActiveRecord::SubclassNotFound.new("Invalid single-table inheritance type: #{subclass_name} is not a subclass of #{name}") end subclass -- cgit v1.2.3