From: Tom Hughes <tom@compton.nu>
Date: Thu, 26 Oct 2023 21:35:23 +0000 (+0100)
Subject: Enable rails 7.1 defaults that relate to rolling upgrades
X-Git-Tag: live~994
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e3312666870c5a6b6a800362af94d3a75406d246?ds=sidebyside

Enable rails 7.1 defaults that relate to rolling upgrades
---

diff --git a/config/application.rb b/config/application.rb
index 2303d321c..23f70fc20 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,6 +29,9 @@ module OpenStreetMap
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql unless Settings.status == "database_offline"
 
+    # Use rails 7.1 cache format
+    config.active_support.cache_format_version = 7.1
+
     # Use memcached for caching if required
     config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers)
 
diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
index b1b7e8583..846ac7bb0 100644
--- a/config/initializers/new_framework_defaults_7_1.rb
+++ b/config/initializers/new_framework_defaults_7_1.rb
@@ -70,7 +70,7 @@ Rails.application.config.active_record.allow_deprecated_singular_associations_na
 # replicas will not be able to deserialize `BigDecimal` arguments from this
 # serializer. Therefore, this setting should only be enabled after all replicas
 # have been successfully upgraded to Rails 7.1.
-# Rails.application.config.active_job.use_big_decimal_serializer = true
+Rails.application.config.active_job.use_big_decimal_serializer = true
 
 # Specify if an `ArgumentError` should be raised if `Rails.cache` `fetch` or
 # `write` are given an invalid `expires_at` or `expires_in` time.
@@ -163,7 +163,7 @@ Rails.application.config.active_record.default_column_serializer = nil
 # not yet been upgraded must be able to read caches from upgraded servers,
 # leave this optimization off on the first deploy, then enable it on a
 # subsequent deploy.
-# Rails.application.config.active_record.marshalling_format_version = 7.1
+Rails.application.config.active_record.marshalling_format_version = 7.1
 
 # Run `after_commit` and `after_*_commit` callbacks in the order they are defined in a model.
 # This matches the behaviour of all other callbacks.