Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Ticket #10677: fixture_model_class_improved_caching.diff

File fixture_model_class_improved_caching.diff, 0.7 kB (added by nwilmes, 9 months ago)
  • activerecord/lib/active_record/fixtures.rb

    old new  
    643643      def read_fixture_files; end 
    644644    end 
    645645 
    646     def model_class 
    647       @model_class ||= @class_name.is_a?(Class) ? 
    648         @class_name : @class_name.constantize rescue nil 
    649     end 
     646  def model_class 
     647    @model_class = (@class_name.is_a?(Class) ? 
     648      @class_name : @class_name.constantize rescue nil) unless defined?(@model_class) 
     649    @model_class 
     650  end 
    650651 
    651652    def primary_key_name 
    652653      @primary_key_name ||= model_class && model_class.primary_key