Merge pull request #32075 from eileencodes/delete-default-configuration

Delete default configuration

3 files changed, 1 insertions, 20 deletions

diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index d8e0cd1e30..0883e80d23 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -315,16 +315,12 @@ module ActiveRecord
           environments << "test" if environment == "development"
 
           ActiveRecord::Base.configurations.slice(*environments).each do |configuration_environment, configuration|
-            next unless configuration["database"]
-
             yield configuration, configuration_environment
           end
         end
 
         def each_local_configuration
           ActiveRecord::Base.configurations.each_value do |configuration|
-            next unless configuration["database"]
-
             if local_database?(configuration)
               yield configuration
             else
diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb
index 21226352ff..da7ca27f13 100644
--- a/activerecord/test/cases/tasks/database_tasks_test.rb
+++ b/activerecord/test/cases/tasks/database_tasks_test.rb
@@ -124,14 +124,6 @@ module ActiveRecord
       ActiveRecord::Base.connection_handler.stubs(:establish_connection)
     end
 
-    def test_ignores_configurations_without_databases
-      @configurations["development"].merge!("database" => nil)
-
-      ActiveRecord::Tasks::DatabaseTasks.expects(:create).never
-
-      ActiveRecord::Tasks::DatabaseTasks.create_all
-    end
-
     def test_ignores_remote_databases
       @configurations["development"].merge!("host" => "my.server.tld")
       $stderr.stubs(:puts).returns(nil)
@@ -250,14 +242,6 @@ module ActiveRecord
       ActiveRecord::Base.stubs(:configurations).returns(@configurations)
     end
 
-    def test_ignores_configurations_without_databases
-      @configurations[:development].merge!("database" => nil)
-
-      ActiveRecord::Tasks::DatabaseTasks.expects(:drop).never
-
-      ActiveRecord::Tasks::DatabaseTasks.drop_all
-    end
-
     def test_ignores_remote_databases
       @configurations[:development].merge!("host" => "my.server.tld")
       $stderr.stubs(:puts).returns(nil)
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 1f765f302c..84595342b2 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -178,6 +178,7 @@ module Rails
               values.reverse_merge!(shared)
             end
           end
+          loaded_yaml.delete("default")
           Hash.new(shared).merge(loaded_yaml)
         elsif ENV["DATABASE_URL"]
           # Value from ENV['DATABASE_URL'] is set to default database connection