gtsocial-umbx

commit 8e30671a62791f50ea61967c43c76af09a56d9f3
parent 00111666a015fb13f7623dc42d35d9f11d29cec0
Author: tobi <31960611+tsmethurst@users.noreply.github.com>
Date:   Wed, 11 May 2022 19:27:25 +0200

[bugfix] Add account raw note fix (#556)

* hack the latest migration to fix psql issue

* add new migration to fix previous migration

* adjust query
Diffstat:
M
internal/db/bundb/migrations/20220506110822_add_account_raw_note.go
 | 
14
+++++---------
A
internal/db/bundb/migrations/20220511165212_add_account_raw_note_fix.go
 | 
46
++++++++++++++++++++++++++++++++++++++++++++++

2 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/internal/db/bundb/migrations/20220506110822_add_account_raw_note.go b/internal/db/bundb/migrations/20220506110822_add_account_raw_note.go
@@ -20,22 +20,18 @@ package migrations
 
 import (
 	"context"
+	"strings"
 
-	gtsmodel "github.com/superseriousbusiness/gotosocial/internal/db/bundb/migrations/20211113114307_init"
 	"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 {
-			// add account raw_note column
-			expr := tx.
-				NewAddColumn().
-				Model(&gtsmodel.Account{}).
-				ColumnExpr("note_raw")
-			_, err := expr.Exec(ctx)
+		_, err := db.ExecContext(ctx, "ALTER TABLE ? ADD COLUMN ? TEXT", bun.Ident("accounts"), bun.Ident("note_raw"))
+		if err != nil && !(strings.Contains(err.Error(), "already exists") || strings.Contains(err.Error(), "duplicate column name")) {
 			return err
-		})
+		}
+		return nil
 	}
 
 	down := func(ctx context.Context, db *bun.DB) error {
diff --git a/internal/db/bundb/migrations/20220511165212_add_account_raw_note_fix.go b/internal/db/bundb/migrations/20220511165212_add_account_raw_note_fix.go
@@ -0,0 +1,46 @@
+/*
+   GoToSocial
+   Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+   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"
+	"strings"
+
+	"github.com/uptrace/bun"
+)
+
+func init() {
+	up := func(ctx context.Context, db *bun.DB) error {
+		_, err := db.ExecContext(ctx, "ALTER TABLE ? ADD COLUMN ? TEXT", bun.Ident("accounts"), bun.Ident("note_raw"))
+		if err != nil && !(strings.Contains(err.Error(), "already exists") || strings.Contains(err.Error(), "duplicate column name")) {
+			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)
+	}
+}