Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Memoize STI class lookups for the duration of a request

  • Loading branch information...
commit d3e30a18b286b1de93fb484170ab6e1723e364a6 1 parent 072cd60
@jeremy jeremy authored
View
4 activerecord/lib/active_record/base.rb
@@ -1171,7 +1171,7 @@ def compute_type(type_name)
if type_name.match(/^::/)
# If the type is prefixed with a scope operator then we assume that
# the type_name is an absolute reference.
- type_name.constantize
+ ActiveSupport::Dependencies.constantize(type_name)
else
# Build a list of candidates to search for
candidates = []
@@ -1180,7 +1180,7 @@ def compute_type(type_name)
candidates.each do |candidate|
begin
- constant = candidate.constantize
+ constant = ActiveSupport::Dependencies.constantize(candidate)
return constant if candidate == constant.to_s
rescue NameError => e
# We don't want to swallow NoMethodError < NameError errors
View
2  activerecord/test/cases/base_test.rb
@@ -1409,7 +1409,7 @@ def test_compute_type_nonexistent_constant
end
def test_compute_type_no_method_error
- String.any_instance.stubs(:constantize).raises(NoMethodError)
+ ActiveSupport::Dependencies.stubs(:constantize).raises(NoMethodError)
assert_raises NoMethodError do
ActiveRecord::Base.send :compute_type, 'InvalidModel'
end
Please sign in to comment.
Something went wrong with that request. Please try again.