From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Dec 2023 17:54:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4391'
X-Git-Tag: live~1396
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d303b4f6e94e99546d8c7bb8b7302572d1cbd5c6?hp=3c3a499e93a3b26d5affc9fe9ebc78d35c5571e0

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

diff --git a/db/migrate/20231206141457_alter_sequences_bigint.rb b/db/migrate/20231206141457_alter_sequences_bigint.rb
new file mode 100644
index 000000000..9920fc863
--- /dev/null
+++ b/db/migrate/20231206141457_alter_sequences_bigint.rb
@@ -0,0 +1,17 @@
+class AlterSequencesBigint < ActiveRecord::Migration[7.1]
+  def up
+    safety_assured do
+      execute "ALTER SEQUENCE oauth_nonces_id_seq AS bigint"
+      execute "ALTER SEQUENCE notes_id_seq AS bigint"
+      execute "ALTER SEQUENCE note_comments_id_seq AS bigint"
+    end
+  end
+
+  def down
+    safety_assured do
+      execute "ALTER SEQUENCE oauth_nonces_id_seq AS integer"
+      execute "ALTER SEQUENCE notes_id_seq AS integer"
+      execute "ALTER SEQUENCE note_comments_id_seq AS integer"
+    end
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index c30378c37..ba60918f0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1024,7 +1024,6 @@ CREATE TABLE public.note_comments (
 --
 
 CREATE SEQUENCE public.note_comments_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1060,7 +1059,6 @@ CREATE TABLE public.notes (
 --
 
 CREATE SEQUENCE public.notes_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1206,7 +1204,6 @@ CREATE TABLE public.oauth_nonces (
 --
 
 CREATE SEQUENCE public.oauth_nonces_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -3513,6 +3510,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('23'),
 ('22'),
 ('21'),
+('20231206141457'),
 ('20231117170422'),
 ('20231101222146'),
 ('20231029151516'),