From fa9b12995911c3e41a7e0ec7e72170838ca9ae90 Mon Sep 17 00:00:00 2001
From: Donal McBreen <donal@37signals.com>
Date: Mon, 9 Sep 2024 19:35:33 +0100
Subject: [PATCH] Remove database from test/development configuration

The installer does not create development or test databases, so don't
include them in the default configuration.

Fixes: https://github.com/rails/solid_cache/issues/216
---
 .../solid_cache/install/templates/config/solid_cache.yml.tt  | 2 +-
 .../solid_cache/solid_cache/install_generator_test.rb        | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/generators/solid_cache/install/templates/config/solid_cache.yml.tt b/lib/generators/solid_cache/install/templates/config/solid_cache.yml.tt
index 49df92b..70a2ac6 100644
--- a/lib/generators/solid_cache/install/templates/config/solid_cache.yml.tt
+++ b/lib/generators/solid_cache/install/templates/config/solid_cache.yml.tt
@@ -1,5 +1,4 @@
 default: &default
-  database: <%= ENV.fetch("DATABASE", "cache") %>
   store_options:
     # Cap age of oldest cache entry to fulfill retention policies
     # max_age: <%%= 60.days.to_i %>
@@ -13,4 +12,5 @@ test:
   <<: *default
 
 production:
+  database: <%= ENV.fetch("DATABASE", "cache") %>
   <<: *default
diff --git a/test/lib/generators/solid_cache/solid_cache/install_generator_test.rb b/test/lib/generators/solid_cache/solid_cache/install_generator_test.rb
index 09434ba..2d98892 100644
--- a/test/lib/generators/solid_cache/solid_cache/install_generator_test.rb
+++ b/test/lib/generators/solid_cache/solid_cache/install_generator_test.rb
@@ -136,7 +136,6 @@ class SolidCache::InstallGeneratorTest < Rails::Generators::TestCase
       def expected_solid_cache_config
         <<~YAML
           default: &default
-            database: cache
             store_options:
               # Cap age of oldest cache entry to fulfill retention policies
               # max_age: <%= 60.days.to_i %>
@@ -150,6 +149,7 @@ def expected_solid_cache_config
             <<: *default
 
           production:
+            database: cache
             <<: *default
         YAML
       end
@@ -157,8 +157,5 @@ def expected_solid_cache_config
       def copy_database_config_fixture_to_destination_root(database)
         FileUtils.cp(File.expand_path("../../../../configs/#{database}-database.yml", __dir__), Pathname.new(destination_root).join("config/database.yml"))
       end
-
-      def expected_mysql_database_config
-      end
   end
 end