aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/railties
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2018-04-06 09:36:07 -0400
committereileencodes <eileencodes@gmail.com>2018-04-06 09:36:07 -0400
commit0a353a97869b2af256d4253533beeb38303cf753 (patch)
tree930d77e3111cf4f687bda416d675e6b832e4d349 /activerecord/lib/active_record/railties
parent475a2911bb17fabea99f14d3ce1497ae77aebb39 (diff)
downloadrails-0a353a97869b2af256d4253533beeb38303cf753.tar.gz
rails-0a353a97869b2af256d4253533beeb38303cf753.tar.bz2
rails-0a353a97869b2af256d4253533beeb38303cf753.zip
Fix structure:dump for multiple databases
ccea4cf broke multiple database structure:dump, the current_config line should have been deleted instead. I'm struggling to write a test for this since the confings are passed from rake to the structure_dump method rather than the other way around. Hoping to come up with a test while I work on structure:load commands for multiple databases.
Diffstat (limited to 'activerecord/lib/active_record/railties')
-rw-r--r--activerecord/lib/active_record/railties/databases.rake3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index fe557b5d2b..24449e8df3 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -317,8 +317,7 @@ db_namespace = namespace :db do
ActiveRecord::DatabaseConfigurations.configs_for(Rails.env) do |spec_name, config|
ActiveRecord::Base.establish_connection(config)
filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(spec_name, :sql)
- current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
- ActiveRecord::Tasks::DatabaseTasks.structure_dump(current_config, filename)
+ ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, filename)
if ActiveRecord::SchemaMigration.table_exists?
File.open(filename, "a") do |f|