Fix two-level database configurations with URLs

An entry in `ActiveRecord::Base.configurations` can either be a
connection spec ("two-level") or a hash of specs ("three-level").

We were detecting two-level configurations by looking for the `database`
key, but the database can also be specified as part of the `url` key,
which meant we incorrectly treated those configurations as three-level.

2 files changed, 53 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb
index 1c7a5d1347..09aef62753 100644
--- a/activerecord/lib/active_record/database_configurations.rb
+++ b/activerecord/lib/active_record/database_configurations.rb
@@ -43,7 +43,7 @@ module ActiveRecord
     # Given an env, spec and config creates DatabaseConfig structs with
     # each attribute set.
     def self.walk_configs(env_name, spec_name, config) # :nodoc:
-      if config["database"] || env_name == "default"
+      if config["database"] || config["url"] || env_name == "default"
         DatabaseConfig.new(env_name, spec_name, config)
       else
         config.each_pair.map do |sub_spec_name, sub_config|
diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index 38c2c8b2f3..48d1fc7eb0 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -179,7 +179,7 @@ module ActiveRecord
       @configurations = {
         "development" => { "database" => "dev-db" },
         "test"        => { "database" => "test-db" },
-        "production"  => { "database" => "prod-db" }
+        "production"  => { "url" => "prod-db-url" }
       }
 
       ActiveRecord::Base.stubs(:configurations).returns(@configurations)
@@ -188,7 +188,16 @@ module ActiveRecord
 
     def test_creates_current_environment_database
       ActiveRecord::Tasks::DatabaseTasks.expects(:create).
-        with("database" => "prod-db")
+        with("database" => "test-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.create_current(
+        ActiveSupport::StringInquirer.new("test")
+      )
+    end
+
+    def test_creates_current_environment_database_with_url
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).
+        with("url" => "prod-db-url")
 
       ActiveRecord::Tasks::DatabaseTasks.create_current(
         ActiveSupport::StringInquirer.new("production")
@@ -237,7 +246,7 @@ module ActiveRecord
       @configurations = {
         "development" => { "primary" => { "database" => "dev-db" }, "secondary" => { "database" => "secondary-dev-db" } },
         "test" => { "primary" => { "database" => "test-db" }, "secondary" => { "database" => "secondary-test-db" } },
-        "production" => { "primary" => { "database" => "prod-db" }, "secondary" => { "database" => "secondary-prod-db" } }
+        "production" => { "primary" => { "url" => "prod-db-url" }, "secondary" => { "url" => "secondary-prod-db-url" } }
       }
 
       ActiveRecord::Base.stubs(:configurations).returns(@configurations)
@@ -246,10 +255,22 @@ module ActiveRecord
 
     def test_creates_current_environment_database
       ActiveRecord::Tasks::DatabaseTasks.expects(:create).
-        with("database" => "prod-db")
+        with("database" => "test-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).
+        with("database" => "secondary-test-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.create_current(
+        ActiveSupport::StringInquirer.new("test")
+      )
+    end
+
+    def test_creates_current_environment_database_with_url
+      ActiveRecord::Tasks::DatabaseTasks.expects(:create).
+        with("url" => "prod-db-url")
 
       ActiveRecord::Tasks::DatabaseTasks.expects(:create).
-        with("database" => "secondary-prod-db")
+        with("url" => "secondary-prod-db-url")
 
       ActiveRecord::Tasks::DatabaseTasks.create_current(
         ActiveSupport::StringInquirer.new("production")
@@ -374,7 +395,7 @@ module ActiveRecord
       @configurations = {
         "development" => { "database" => "dev-db" },
         "test"        => { "database" => "test-db" },
-        "production"  => { "database" => "prod-db" }
+        "production"  => { "url" => "prod-db-url" }
       }
 
       ActiveRecord::Base.stubs(:configurations).returns(@configurations)
@@ -382,7 +403,16 @@ module ActiveRecord
 
     def test_drops_current_environment_database
       ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
-        with("database" => "prod-db")
+        with("database" => "test-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_current(
+        ActiveSupport::StringInquirer.new("test")
+      )
+    end
+
+    def test_drops_current_environment_database_with_url
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
+        with("url" => "prod-db-url")
 
       ActiveRecord::Tasks::DatabaseTasks.drop_current(
         ActiveSupport::StringInquirer.new("production")
@@ -421,7 +451,7 @@ module ActiveRecord
       @configurations = {
         "development" => { "primary" => { "database" => "dev-db" }, "secondary" => { "database" => "secondary-dev-db" } },
         "test" => { "primary" => { "database" => "test-db" }, "secondary" => { "database" => "secondary-test-db" } },
-        "production" => { "primary" => { "database" => "prod-db" }, "secondary" => { "database" => "secondary-prod-db" } }
+        "production" => { "primary" => { "url" => "prod-db-url" }, "secondary" => { "url" => "secondary-prod-db-url" } }
       }
 
       ActiveRecord::Base.stubs(:configurations).returns(@configurations)
@@ -429,10 +459,22 @@ module ActiveRecord
 
     def test_drops_current_environment_database
       ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
-        with("database" => "prod-db")
+        with("database" => "test-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
+        with("database" => "secondary-test-db")
+
+      ActiveRecord::Tasks::DatabaseTasks.drop_current(
+        ActiveSupport::StringInquirer.new("test")
+      )
+    end
+
+    def test_drops_current_environment_database_with_url
+      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
+        with("url" => "prod-db-url")
 
       ActiveRecord::Tasks::DatabaseTasks.expects(:drop).
-        with("database" => "secondary-prod-db")
+        with("url" => "secondary-prod-db-url")
 
       ActiveRecord::Tasks::DatabaseTasks.drop_current(
         ActiveSupport::StringInquirer.new("production")