From 4c052c85f583a41b2c26428555552186284fe7a7 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:09:55 +0000
Subject: [bugfix] Rename domain perm sub migration to unique date (#3679)

* [bugfix] Rename domain perm sub migration to unique date

* add repeat migration
---
 ...241022153016_domain_permission_subscriptions.go | 75 --------------------
 ...250119112745_domain_permission_subscriptions.go | 75 ++++++++++++++++++++
 ...20250124164400_domain_perm_sub_migration_fix.go | 82 ++++++++++++++++++++++
 3 files changed, 157 insertions(+), 75 deletions(-)
 delete mode 100644 internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions.go
 create mode 100644 internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go
 create mode 100644 internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go

(limited to 'internal')

diff --git a/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions.go b/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions.go
deleted file mode 100644
index 7d2bd085c..000000000
--- a/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package migrations
-
-import (
-	"context"
-
-	gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions"
-	"github.com/uptrace/bun"
-)
-
-func init() {
-	up := func(ctx context.Context, db *bun.DB) error {
-		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
-			// Create `domain_permission_subscriptions`.
-			if _, err := tx.
-				NewCreateTable().
-				Model((*gtsmodel.DomainPermissionSubscription)(nil)).
-				IfNotExists().
-				Exec(ctx); err != nil {
-				return err
-			}
-
-			// Create indexes. Indices. Indie sexes.
-			if _, err := tx.
-				NewCreateIndex().
-				Table("domain_permission_subscriptions").
-				// Filter on permission type.
-				Index("domain_permission_subscriptions_permission_type_idx").
-				Column("permission_type").
-				IfNotExists().
-				Exec(ctx); err != nil {
-				return err
-			}
-
-			if _, err := tx.
-				NewCreateIndex().
-				Table("domain_permission_subscriptions").
-				// Sort by priority DESC.
-				Index("domain_permission_subscriptions_priority_order_idx").
-				ColumnExpr("? DESC", bun.Ident("priority")).
-				IfNotExists().
-				Exec(ctx); err != nil {
-				return err
-			}
-
-			return nil
-		})
-	}
-
-	down := func(ctx context.Context, db *bun.DB) error {
-		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
-			return nil
-		})
-	}
-
-	if err := Migrations.Register(up, down); err != nil {
-		panic(err)
-	}
-}
diff --git a/internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go b/internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go
new file mode 100644
index 000000000..7d2bd085c
--- /dev/null
+++ b/internal/db/bundb/migrations/20250119112745_domain_permission_subscriptions.go
@@ -0,0 +1,75 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package migrations
+
+import (
+	"context"
+
+	gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions"
+	"github.com/uptrace/bun"
+)
+
+func init() {
+	up := func(ctx context.Context, db *bun.DB) error {
+		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
+			// Create `domain_permission_subscriptions`.
+			if _, err := tx.
+				NewCreateTable().
+				Model((*gtsmodel.DomainPermissionSubscription)(nil)).
+				IfNotExists().
+				Exec(ctx); err != nil {
+				return err
+			}
+
+			// Create indexes. Indices. Indie sexes.
+			if _, err := tx.
+				NewCreateIndex().
+				Table("domain_permission_subscriptions").
+				// Filter on permission type.
+				Index("domain_permission_subscriptions_permission_type_idx").
+				Column("permission_type").
+				IfNotExists().
+				Exec(ctx); err != nil {
+				return err
+			}
+
+			if _, err := tx.
+				NewCreateIndex().
+				Table("domain_permission_subscriptions").
+				// Sort by priority DESC.
+				Index("domain_permission_subscriptions_priority_order_idx").
+				ColumnExpr("? DESC", bun.Ident("priority")).
+				IfNotExists().
+				Exec(ctx); err != nil {
+				return err
+			}
+
+			return nil
+		})
+	}
+
+	down := func(ctx context.Context, db *bun.DB) error {
+		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
+			return nil
+		})
+	}
+
+	if err := Migrations.Register(up, down); err != nil {
+		panic(err)
+	}
+}
diff --git a/internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go b/internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go
new file mode 100644
index 000000000..5914c752a
--- /dev/null
+++ b/internal/db/bundb/migrations/20250124164400_domain_perm_sub_migration_fix.go
@@ -0,0 +1,82 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package migrations
+
+import (
+	"context"
+
+	gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20241022153016_domain_permission_subscriptions"
+	"github.com/uptrace/bun"
+)
+
+// This file exists because tobi is a silly billy and named two migration files
+// with the same date part, so the latter migration didn't always run properly.
+// The file just repeats migrations in 20250119112745_domain_permission_subscriptions.go,
+// which will be a noop in most cases, but will fix some issues for those who
+// were running snapshots between GtS v0.17.0 and GtS v0.18.0.
+//
+// See https://github.com/superseriousbusiness/gotosocial/pull/3679.
+func init() {
+	up := func(ctx context.Context, db *bun.DB) error {
+		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
+			// Create `domain_permission_subscriptions`.
+			if _, err := tx.
+				NewCreateTable().
+				Model((*gtsmodel.DomainPermissionSubscription)(nil)).
+				IfNotExists().
+				Exec(ctx); err != nil {
+				return err
+			}
+
+			// Create indexes. Indices. Indie sexes.
+			if _, err := tx.
+				NewCreateIndex().
+				Table("domain_permission_subscriptions").
+				// Filter on permission type.
+				Index("domain_permission_subscriptions_permission_type_idx").
+				Column("permission_type").
+				IfNotExists().
+				Exec(ctx); err != nil {
+				return err
+			}
+
+			if _, err := tx.
+				NewCreateIndex().
+				Table("domain_permission_subscriptions").
+				// Sort by priority DESC.
+				Index("domain_permission_subscriptions_priority_order_idx").
+				ColumnExpr("? DESC", bun.Ident("priority")).
+				IfNotExists().
+				Exec(ctx); err != nil {
+				return err
+			}
+
+			return nil
+		})
+	}
+
+	down := func(ctx context.Context, db *bun.DB) error {
+		return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
+			return nil
+		})
+	}
+
+	if err := Migrations.Register(up, down); err != nil {
+		panic(err)
+	}
+}
-- 
cgit v1.2.3