Changeset 7662

Timestamp:

09/28/07 14:05:03 (2 years ago)

Author:

david

Message:

Added fixture caching thatll speed up a normal fixture-powered test suite between 50% and 100% (closes #9682) [frederick.cheung@gmail.com]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/fixtures.rb (modified) (4 diffs)
• trunk/activerecord/test/connection_test_mysql.rb (modified) (1 diff)
• trunk/activerecord/test/fixtures_test.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added fixture caching that'll speed up a normal fixture-powered test suite between 50% and 100% #9682 [frederick.cheung@gmail.com]
-
-* Correctly quote id list for limited eager loading.  #7482 [tmacedo]

trunk/activerecord/lib/active_record/fixtures.rb

@@ -219 +219 @@
-  DEFAULT_FILTER_RE = /\.ya?ml$/
-
+  @@all_cached_fixtures = {}
+  
+  def self.reset_cache(connection=ActiveRecord::Base.connection)
+    @@all_cached_fixtures[connection.object_id] = {}
+  end
+  
+  def self.cache_for_connection(connection)
+    @@all_cached_fixtures[connection.object_id] ||= {}
+    @@all_cached_fixtures[connection.object_id]
+  end
+  
+  def self.fixture_is_cached?(connection, table_name)
+    cache_for_connection(connection)[table_name]
+  end
+
+  def self.cached_fixtures(connection, keys_to_fetch = nil)
+    if keys_to_fetch
+      fixtures = cache_for_connection(connection).values_at(*keys_to_fetch)
+    else
+      fixtures = cache_for_connection(connection).values
+    end
+    fixtures.size > 1 ? fixtures : fixtures.first
+  end
+
+  def self.cache_fixtures(connection, fixtures)
+    cache_for_connection(connection).merge! fixtures.index_by(&:table_name)
+  end
+  
-  def self.instantiate_fixtures(object, table_name, fixtures, load_instances=true)
-    object.instance_variable_set "@#{table_name.to_s.gsub('.','_')}", fixtures
@@ -247 +275 @@
-    connection  = block_given? ? yield : ActiveRecord::Base.connection
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -548 +581 @@
-        @fixture_cache = Hash.new
-
+        if !use_transactional_fixtures?
+          Fixtures.reset_cache #we don't want the test to use any of our cached data
+        end
+        
-        # Load fixtures once and begin transaction.
-        if use_transactional_fixtures?
@@ -574 +611 @@
-        return unless defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
-
+        if !use_transactional_fixtures?
+          Fixtures.reset_cache #the non transactional test may have fiddled with the data - dump caches
+        end
+        
-        # Rollback changes if a transaction is active.
-        if use_transactional_fixtures? && Thread.current['open_transactions'] != 0

trunk/activerecord/test/connection_test_mysql.rb

@@ -2 +2 @@
-
-class MysqlConnectionTest < Test::Unit::TestCase
+  self.use_transactional_fixtures = false
-  def setup
-    @connection = ActiveRecord::Base.connection

trunk/activerecord/test/fixtures_test.rb

@@ -59 +59 @@
-  if ActiveRecord::Base.connection.supports_migrations?
-    def test_inserts_with_pre_and_suffix
+      Fixtures.reset_cache
-      ActiveRecord::Base.connection.create_table :prefix_topics_suffix do |t|
-        t.column :title, :string
@@ -426 +427 @@
-  end
-end
+
+class FasterFixturesTest < Test::Unit::TestCase
+  fixtures :categories, :authors
+  
+  def run(*args, &block)
+    Fixtures.reset_cache
+    super(*args, &block)
+  end
+  
+  def load_extra_fixture(name)
+    fixture = create_fixtures(name)
+    assert fixture.is_a?(Fixtures)
+    @loaded_fixtures[fixture.table_name] = fixture
+  end
+  
+  def test_cache
+    assert Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'categories')
+    assert Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'authors')
+    
+    assert_no_queries do
+      create_fixtures('categories')
+      create_fixtures('authors')
+    end
+    
+    load_extra_fixture('posts')
+    assert Fixtures.fixture_is_cached?(ActiveRecord::Base.connection, 'posts')
+    self.class.setup_fixture_accessors('posts')
+    assert_equal 'Welcome to the weblog', posts(:welcome).title
+  end
+end