aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-01-31 18:16:10 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-01-31 18:16:10 -0800
commite2ccfebab4fd37603546998df2ee57b8bb07c168 (patch)
treebd9435acafc2e71e910fc769ba21f4e944abad80
parentc79220368e8180141e9d796cf026d2b7da9f6384 (diff)
parente773ca99f27a8051828ef29e170478ba8dc7e491 (diff)
downloadrails-e2ccfebab4fd37603546998df2ee57b8bb07c168.tar.gz
rails-e2ccfebab4fd37603546998df2ee57b8bb07c168.tar.bz2
rails-e2ccfebab4fd37603546998df2ee57b8bb07c168.zip
Merge pull request #18760 from hjoo/fix_fixtures
changed deleted_tables list to set
-rw-r--r--activerecord/lib/active_record/fixtures.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index fc7b2ec850..57db2faaff 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -1,6 +1,7 @@
require 'erb'
require 'yaml'
require 'zlib'
+require 'set'
require 'active_support/dependencies'
require 'active_support/core_ext/digest/uuid'
require 'active_record/fixture_set/file'
@@ -521,7 +522,7 @@ module ActiveRecord
update_all_loaded_fixtures fixtures_map
connection.transaction(:requires_new => true) do
- deleted_tables = []
+ deleted_tables = Set.new
fixture_sets.each do |fs|
conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
table_rows = fs.table_rows