diff --git a/internal/db/bundb/migrations/20220506110822_add_account_raw_note.go b/internal/db/bundb/migrations/20220506110822_add_account_raw_note.go index 3574c9ce4..816d21b73 100644 --- 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(>smodel.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 new file mode 100644 index 000000000..816d21b73 --- /dev/null +++ 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 . +*/ + +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) + } +}