From 1df0a07f060291397dcbc8dd39e3abd3ad915a78 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 8 Nov 2008 22:49:00 -0500
Subject: lazy-initialize already loaded fixtures map

---
 activerecord/lib/active_record/fixtures.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 24aabf0359..a09f58fc23 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -832,7 +832,6 @@ module ActiveRecord
         self.use_instantiated_fixtures = true
         self.pre_loaded_fixtures = false
 
-        @@already_loaded_fixtures = {}
         self.fixture_class_names = {}
       end
 
@@ -940,6 +939,7 @@ module ActiveRecord
       # Load fixtures for every test.
       else
         Fixtures.reset_cache
+        @@already_loaded_fixtures ||= {}
         @@already_loaded_fixtures[self.class] = nil
         load_fixtures
       end
-- 
cgit v1.2.3