Merge pull request #35663 from...

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

Fix database configuration when adding another config level

activerecord/lib/active_record/database_configurations.rb

@@ -106,7 +106,7 @@ def build_configs(configs)
 
         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)

railties/test/isolation/abstract_unit.rb

@@ -123,6 +123,8 @@ def build_app(options = {})
             adapter: sqlite3
             pool: 5
             timeout: 5000
+            variables:
+              statement_timeout: 1000
           development:
             primary:
               <<: *default