kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Clean up load_schema options 

The filename and format are derived in the load_schema method when called from
the rake tasks without arguments. Since these are the same as the
defaults we don't need to pass them into the `load_schema` method.
This commit is contained in:
eileencodes 2021-10-21 11:06:27 -04:00
parent bcb2a112c7
commit 35e79f05ef
No known key found for this signature in database
GPG Key ID: BA5C575120BBE8DF
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/railties/databases.rake
View File

@ -495,7 +495,7 @@ db_namespace = namespace :db do
task name => :load_config do
original_db_config = ActiveRecord::Base.connection_db_config
db_config = ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env, name: name)
ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config, ActiveRecord.schema_format, ENV["SCHEMA"])
ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config)
ensure
ActiveRecord::Base.establish_connection(original_db_config) if original_db_config
end
@ -615,8 +615,7 @@ db_namespace = namespace :db do
should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
ActiveRecord::Schema.verbose = false
ActiveRecord::Base.configurations.configs_for(env_name: "test").each do |db_config|
filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(db_config.name)
ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config, ActiveRecord.schema_format, filename)
ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config)
end
ensure
if should_reconnect
@ -660,9 +659,8 @@ db_namespace = namespace :db do
task name => "db:test:purge:#{name}" do
should_reconnect = ActiveRecord::Base.connection_pool.active_connection?
ActiveRecord::Schema.verbose = false
filename = ActiveRecord::Tasks::DatabaseTasks.dump_filename(name)
db_config = ActiveRecord::Base.configurations.configs_for(env_name: "test", name: name)
ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config, ActiveRecord.schema_format, filename)
ActiveRecord::Tasks::DatabaseTasks.load_schema(db_config)
ensure
if should_reconnect
ActiveRecord::Base.establish_connection(ActiveRecord::Tasks::DatabaseTasks.env.to_sym)