Merge pull request #35663 from eileencodes/fix-database-configuration-when-not-actually-a-three-tier

Fix database configuration when adding another config level
2019-03-18 19:58:42 -04:00 · 2019-03-18 19:58:42 -04:00 · 6e94127dd2
parent ded9a15424 8f3066fccc
commit 6e94127dd2
2 changed files with 3 additions and 1 deletions
--- a/activerecord/lib/active_record/database_configurations.rb
+++ b/activerecord/lib/active_record/database_configurations.rb
@ -106,7 +106,7 @@ module ActiveRecord

        build_db_config = configs.each_pair.flat_map do |env_name, config|
          walk_configs(env_name.to_s, "primary", config)
-        end.compact
+        end.flatten.compact

        if url = ENV["DATABASE_URL"]
          build_url_config(url, build_db_config)
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@ -123,6 +123,8 @@ module TestHelpers
            adapter: sqlite3
            pool: 5
            timeout: 5000
+            variables:
+              statement_timeout: 1000
          development:
            primary:
              <<: *default