diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-05 02:20:26 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-05 02:20:26 +0000 |
| commit | f42063d038a04d7c43ce617d727b0fc6f91f888b (patch) | |
| tree | 95869dd622e1f57bc42724fcc1c6f0865360fc14 /activerecord/lib/active_record/fixtures.rb | |
| parent | 3464a7e79c373947ea7d57c543e36f41bd62049e (diff) | |
| download | rails-f42063d038a04d7c43ce617d727b0fc6f91f888b.tar.gz rails-f42063d038a04d7c43ce617d727b0fc6f91f888b.tar.bz2 rails-f42063d038a04d7c43ce617d727b0fc6f91f888b.zip | |
Cache fixture model class. References #10677 [nwilmes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8560 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
| -rwxr-xr-x | activerecord/lib/active_record/fixtures.rb | 12 |
1 files changed, 10 insertions, 2 deletions
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 |