diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-07-24 19:49:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-24 19:49:14 -0400 |
commit | 49b531ba588eb8da50ee810b377a461dc9aee618 (patch) | |
tree | 52830451acc81d8ae2783d29ee4777ab5c066f78 /activerecord/test | |
parent | b1c27c059c88642aaf4a0c486320c03de4f165f6 (diff) | |
parent | 396dba08741b2c1d5a41debbb4bbde799c9f2a31 (diff) | |
download | rails-49b531ba588eb8da50ee810b377a461dc9aee618.tar.gz rails-49b531ba588eb8da50ee810b377a461dc9aee618.tar.bz2 rails-49b531ba588eb8da50ee810b377a461dc9aee618.zip |
Merge pull request #36756 from seejohnrun/env-urls-with-multiple-databases
Fix multiple database support for DATABASE_URL env variable
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb b/activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb index 6372abbf3f..15a045ed23 100644 --- a/activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb +++ b/activerecord/test/cases/connection_adapters/merge_and_resolve_default_url_config_test.rb @@ -323,6 +323,30 @@ module ActiveRecord assert_equal expected, actual end + + def test_tiered_configs_with_database_url + ENV["DATABASE_URL"] = "postgres://localhost/foo" + + config = { + "default_env" => { + "primary" => { "pool" => 5 }, + "animals" => { "pool" => 5 } + } + } + + expected = { + "adapter" => "postgresql", + "database" => "foo", + "host" => "localhost", + "pool" => 5 + } + + ["primary", "animals"].each do |spec_name| + configs = ActiveRecord::DatabaseConfigurations.new(config) + actual = configs.configs_for(env_name: "default_env", spec_name: spec_name).config + assert_equal expected, actual + end + end end end end |