From f42063d038a04d7c43ce617d727b0fc6f91f888b Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 5 Jan 2008 02:20:26 +0000 Subject: Cache fixture model class. References #10677 [nwilmes] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8560 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/fixtures.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index f424b9379c..a0f62e890e 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -644,8 +644,16 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash) end def model_class - @model_class ||= @class_name.is_a?(Class) ? - @class_name : @class_name.constantize rescue nil + unless defined?(@model_class) + @model_class = + if @class_name.nil? || @class_name.is_a?(Class) + @class_name + else + @class_name.constantize rescue nil + end + end + + @model_class end def primary_key_name -- cgit v1.2.3