From 6a6fecc5f4acc6b1832fb3c4bf95509999a749b5 Mon Sep 17 00:00:00 2001 From: Orban Botond Date: Tue, 9 Sep 2025 18:55:50 +0300 Subject: [PATCH 1/2] Generate reference to the database in the cache template for all environments. --- Gemfile.lock | 6 +++--- .../solid_cache/install/templates/config/cache.yml.tt | 2 ++ .../solid_cache/solid_cache/install_generator_test.rb | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 189c9cd..5ece450 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -166,9 +166,9 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.7.0-arm64-darwin) - sqlite3 (1.7.0-x86_64-darwin) - sqlite3 (1.7.0-x86_64-linux) + sqlite3 (2.7.3-arm64-darwin) + sqlite3 (2.7.3-x86_64-darwin) + sqlite3 (2.7.3-x86_64-linux-gnu) stringio (3.1.2) thor (1.3.2) timeout (0.4.2) 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 70a2ac6..50262ec 100644 --- a/lib/generators/solid_cache/install/templates/config/cache.yml.tt +++ b/lib/generators/solid_cache/install/templates/config/cache.yml.tt @@ -6,9 +6,11 @@ default: &default namespace: <%%= Rails.env %> development: + database: <%= ENV.fetch("DATABASE", "cache") %> <<: *default test: + database: <%= ENV.fetch("DATABASE", "cache") %> <<: *default production: 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 045e90f..e8dd5ea 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 @@ -37,9 +37,11 @@ def expected_cache_config namespace: <%= Rails.env %> development: + database: cache <<: *default test: + database: cache <<: *default production: From ca1327d0a13700aa507609d1f8d15797533130f8 Mon Sep 17 00:00:00 2001 From: Donal McBreen Date: Thu, 6 Nov 2025 15:42:23 +0000 Subject: [PATCH 2/2] Set database once in default --- .../solid_cache/install/templates/config/cache.yml.tt | 4 +--- .../solid_cache/solid_cache/install_generator_test.rb | 4 +--- 2 files changed, 2 insertions(+), 6 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 50262ec..49df92b 100644 --- a/lib/generators/solid_cache/install/templates/config/cache.yml.tt +++ b/lib/generators/solid_cache/install/templates/config/cache.yml.tt @@ -1,4 +1,5 @@ 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 %> @@ -6,13 +7,10 @@ default: &default namespace: <%%= Rails.env %> development: - database: <%= ENV.fetch("DATABASE", "cache") %> <<: *default test: - database: <%= ENV.fetch("DATABASE", "cache") %> <<: *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 e8dd5ea..37034cb 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 @@ -30,6 +30,7 @@ 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 %> @@ -37,15 +38,12 @@ def expected_cache_config namespace: <%= Rails.env %> development: - database: cache <<: *default test: - database: cache <<: *default production: - database: cache <<: *default YAML end