diff options
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 62ea47226e..5b02d17f59 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1232,9 +1232,12 @@ module ActiveRecord #:nodoc: # Returns the class type of the record using the current module as a prefix. So descendents of # MyApp::Business::Account would appear as MyApp::Business::AccountSubclass. def compute_type(type_name) + modularized_name = type_name_with_module(type_name) begin - instance_eval(type_name_with_module(type_name)) - rescue Object + instance_eval(modularized_name) + rescue NameError => e + first_module = modularized_name.split("::").first + raise unless e.to_s.include? first_module instance_eval(type_name) end end |