From 799081e846966340e6609f7b6cb1d11cf64ceb86 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 7 Jun 2018 20:30:19 +1000 Subject: [PATCH] attempt all column dropping upfront prior to loading cache --- db/fixtures/{999_delayed.rb => 000_delayed_drops.rb} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename db/fixtures/{999_delayed.rb => 000_delayed_drops.rb} (97%) diff --git a/db/fixtures/999_delayed.rb b/db/fixtures/000_delayed_drops.rb similarity index 97% rename from db/fixtures/999_delayed.rb rename to db/fixtures/000_delayed_drops.rb index 6739571eee7..eda3f843dbc 100644 --- a/db/fixtures/999_delayed.rb +++ b/db/fixtures/000_delayed_drops.rb @@ -1,6 +1,7 @@ # Delayed migration steps require 'migration/table_dropper' +require 'migration/column_dropper' Migration::ColumnDropper.drop( table: 'user_profiles', @@ -182,6 +183,3 @@ Migration::TableDropper.delayed_drop( STDERR.puts "Resetting Active Record Cache" Discourse.reset_active_record_cache -ActiveRecord::Base.connection.close -# for some reason connection tables may be off? -User.reset_column_information