summaryrefslogtreecommitdiff
path: root/vendor/github.com/uptrace/bun/migrate/migration.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-08-15 12:35:05 +0200
committerLibravatar GitHub <noreply@github.com>2022-08-15 11:35:05 +0100
commitac6ed3d939fe9dad81aadbd04541e905c625ca82 (patch)
tree6116baf25675837dc99f69c49b9fec2ff112ce5c /vendor/github.com/uptrace/bun/migrate/migration.go
parent[frontend] Sensitive media spoilers (#752) (diff)
downloadgotosocial-ac6ed3d939fe9dad81aadbd04541e905c625ca82.tar.xz
[chore] Update bun / sqlite versions; update gtsmodels (#754)
* upstep bun and sqlite versions * allow specific columns to be updated in the db * only update necessary columns for user * bit tidier * only update necessary fields of media_attachment * only update relevant instance fields * update tests * update only specific account columns * use bool pointers on gtsmodels includes attachment, status, account, user * update columns more selectively * test all default fields on new account insert * updating remaining bools on gtsmodels * initialize pointer fields when extracting AP emoji * copy bools properly * add copyBoolPtr convenience function + test it * initialize false bool ptrs a bit more neatly
Diffstat (limited to 'vendor/github.com/uptrace/bun/migrate/migration.go')
-rw-r--r--vendor/github.com/uptrace/bun/migrate/migration.go32
1 files changed, 21 insertions, 11 deletions
diff --git a/vendor/github.com/uptrace/bun/migrate/migration.go b/vendor/github.com/uptrace/bun/migrate/migration.go
index 05bd6006c..ae649446d 100644
--- a/vendor/github.com/uptrace/bun/migrate/migration.go
+++ b/vendor/github.com/uptrace/bun/migrate/migration.go
@@ -25,11 +25,11 @@ type Migration struct {
Down MigrationFunc `bun:"-"`
}
-func (m *Migration) String() string {
+func (m Migration) String() string {
return m.Name
}
-func (m *Migration) IsApplied() bool {
+func (m Migration) IsApplied() bool {
return m.ID > 0
}
@@ -89,6 +89,22 @@ func NewSQLMigrationFunc(fsys fs.FS, name string) MigrationFunc {
idb = conn
}
+ var retErr error
+
+ defer func() {
+ if tx, ok := idb.(bun.Tx); ok {
+ retErr = tx.Commit()
+ return
+ }
+
+ if conn, ok := idb.(bun.Conn); ok {
+ retErr = conn.Close()
+ return
+ }
+
+ panic("not reached")
+ }()
+
for _, q := range queries {
_, err = idb.ExecContext(ctx, q)
if err != nil {
@@ -96,13 +112,7 @@ func NewSQLMigrationFunc(fsys fs.FS, name string) MigrationFunc {
}
}
- if tx, ok := idb.(bun.Tx); ok {
- return tx.Commit()
- } else if conn, ok := idb.(bun.Conn); ok {
- return conn.Close()
- }
-
- panic("not reached")
+ return retErr
}
}
@@ -222,11 +232,11 @@ type MigrationGroup struct {
Migrations MigrationSlice
}
-func (g *MigrationGroup) IsZero() bool {
+func (g MigrationGroup) IsZero() bool {
return g.ID == 0 && len(g.Migrations) == 0
}
-func (g *MigrationGroup) String() string {
+func (g MigrationGroup) String() string {
if g.IsZero() {
return "nil"
}