From: Tom Hughes <tom@compton.nu>
Date: Fri, 23 Aug 2024 17:27:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5106'
X-Git-Tag: live~691
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fba6f95b3918bdaa153f1624e82a2e79672f1fa5?hp=ec5754a9bd56dbb802a2897851ebf71deb017f89

Merge remote-tracking branch 'upstream/pull/5106'
---

diff --git a/db/migrate/20240822121603_backfill_deactivates_at_in_user_blocks.rb b/db/migrate/20240822121603_backfill_deactivates_at_in_user_blocks.rb
new file mode 100644
index 000000000..38c010c44
--- /dev/null
+++ b/db/migrate/20240822121603_backfill_deactivates_at_in_user_blocks.rb
@@ -0,0 +1,11 @@
+class BackfillDeactivatesAtInUserBlocks < ActiveRecord::Migration[7.1]
+  class UserBlock < ApplicationRecord; end
+
+  disable_ddl_transaction!
+
+  def up
+    UserBlock.where(:needs_view => false, :deactivates_at => nil).in_batches do |relation|
+      relation.update_all("deactivates_at = GREATEST(ends_at, updated_at)")
+    end
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 18884b058..49cd4b9fb 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -3579,6 +3579,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('23'),
 ('22'),
 ('21'),
+('20240822121603'),
 ('20240813070506'),
 ('20240618193051'),
 ('20240605134916'),