github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

avoid side effects from method calls, localize ivar assignment

Browse Source
This commit is contained in:
Aaron Patterson
2011-02-11 16:22:38 -08:00
parent af5b1db965
commit e0802fa176
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
activerecord/lib/active_record/fixtures.rb
View File

@@ -955,7 +955,8 @@ module ActiveRecord
if @@already_loaded_fixtures[self.class]
@loaded_fixtures = @@already_loaded_fixtures[self.class]
else
@@already_loaded_fixtures[self.class] = load_fixtures
@loaded_fixtures = load_fixtures
@@already_loaded_fixtures[self.class] = @loaded_fixtures
end
ActiveRecord::Base.connection.increment_open_transactions
ActiveRecord::Base.connection.transaction_joinable = false
@@ -964,7 +965,7 @@ module ActiveRecord
else
Fixtures.reset_cache
@@already_loaded_fixtures[self.class] = nil
load_fixtures
@loaded_fixtures = load_fixtures
end
# Instantiate fixtures for every test if requested.
@@ -989,7 +990,7 @@ module ActiveRecord
private
def load_fixtures
fixtures = Fixtures.create_fixtures(fixture_path, fixture_table_names, fixture_class_names)
@loaded_fixtures = Hash[fixtures.map { |f| [f.name, f] }]
Hash[fixtures.map { |f| [f.name, f] }]
end
# for pre_loaded_fixtures, only require the classes once. huge speed improvement