From b197ebdafe3873d35c5dd143d5307a25b4d00b92 Mon Sep 17 00:00:00 2001 From: Donal McBreen Date: Sat, 8 Nov 2025 19:50:59 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"Generate=20reference=20to=20the=20dat?= =?UTF-8?q?abase=20in=20the=20cache=20template=20for=20all=20envi=E2=80=A6?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fb7debdca9384db69f988fb91053dfd8c2f54657. --- .../solid_cache/install/templates/config/cache.yml.tt | 2 +- .../solid_cache/solid_cache/install_generator_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generators/solid_cache/install/templates/config/cache.yml.tt b/lib/generators/solid_cache/install/templates/config/cache.yml.tt index 49df92b..70a2ac6 100644 --- a/lib/generators/solid_cache/install/templates/config/cache.yml.tt +++ b/lib/generators/solid_cache/install/templates/config/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 fbd5af5..fd12cbc 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 @@ -72,7 +72,6 @@ class SolidCache::InstallGeneratorTest < Rails::Generators::TestCase def expected_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 %> @@ -86,6 +85,7 @@ def expected_cache_config <<: *default production: + database: cache <<: *default YAML end