未验证 提交 73ae5655 编写于 作者: E Eileen M. Uchitelle 提交者: GitHub

Merge pull request #40175 from tgxworld/fix_setting_ar_configurations_twice

Avoid setting `ActiveRecord::Base.configurations` twice in db rake ta…
......@@ -39,8 +39,6 @@ class Railtie < Rails::Railtie # :nodoc:
rake_tasks do
namespace :db do
task :load_config do
ActiveRecord::Tasks::DatabaseTasks.database_configuration = Rails.application.config.database_configuration
if defined?(ENGINE_ROOT) && engine = Rails::Engine.find(ENGINE_ROOT)
if engine.paths["db/migrate"].existent
ActiveRecord::Tasks::DatabaseTasks.migrations_paths += engine.paths["db/migrate"].to_a
......
......@@ -19,7 +19,10 @@ db_namespace = namespace :db do
end
task load_config: :environment do
ActiveRecord::Base.configurations = ActiveRecord::Tasks::DatabaseTasks.database_configuration || {}
if ActiveRecord::Base.configurations.empty?
ActiveRecord::Base.configurations = ActiveRecord::Tasks::DatabaseTasks.database_configuration
end
ActiveRecord::Migrator.migrations_paths = ActiveRecord::Tasks::DatabaseTasks.migrations_paths
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册