Set Identity Map disabled by default. Enable it for testing.

rails · Nov 19, 2010 · 6d58b27 · 6d58b27
1 parent ab42382
commit 6d58b27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/identity_map.rb b/activerecord/lib/active_record/identity_map.rb
@@ -49,7 +49,7 @@ def clear
 
     self.repositories ||= Hash.new
     self.current_repository_name ||= :default
-    self.enabled = true
+    self.enabled = false
 
     module InstanceMethods
 

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
@@ -31,6 +31,9 @@
 # Quote "type" if it's a reserved word for the current connection.
 QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name('type')
 
+# Enable Identity Map for testing
+ActiveRecord::IdentityMap.enabled = true
+
 def current_adapter?(*types)
   types.any? do |type|
     ActiveRecord::ConnectionAdapters.const_defined?(type) &&