mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Remove assumption that a primary config exists
Applications may not have a primary configuration so we should not assume there is one. In both these cases we can get the right connection without that. For the databases.rake file we want to re-establish a connection for the environment we're in. The first config defined under an environment for a multi-db app will win. This is already the case on application boot so we should be consistent. For the info.rb file we already have a connection so we can lookup the adapter from the connection's db_config. If a primary hadn't existed this would have thrown an exception. Followup to https://github.com/rails/rails/pull/39535 which removed the assumption there was a primary config from the schema cache load railtie. Co-authored-by: John Crepezzi <john.crepezzi@gmail.com>
This commit is contained in:
parent
c42b355c39
commit
7b4fdf3ce7
2 changed files with 2 additions and 2 deletions
|
@ -563,7 +563,7 @@ db_namespace = namespace :db do
|
||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
if should_reconnect
|
if should_reconnect
|
||||||
ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env, name: "primary"))
|
ActiveRecord::Base.establish_connection(ActiveRecord::Tasks::DatabaseTasks.env.to_sym)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,7 @@ module Rails
|
||||||
|
|
||||||
# The name of the database adapter for the current environment.
|
# The name of the database adapter for the current environment.
|
||||||
property "Database adapter" do
|
property "Database adapter" do
|
||||||
ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: "primary").adapter
|
ActiveRecord::Base.connection.pool.db_config.adapter
|
||||||
end
|
end
|
||||||
|
|
||||||
property "Database schema version" do
|
property "Database schema version" do
|
||||||
|
|
Loading…
Reference in a new issue