diff options
| author |  kim (grufwub) <grufwub@gmail.com> | 2021-09-08 21:13:54 +0100 |
|---|---|---|
| committer | kim (grufwub) <grufwub@gmail.com> | 2021-09-08 21:13:54 +0100 |
| commit | 6a2d0d9508392425392738743fa4dd5b5d93bdb4 (patch) | |
| tree | 2c076235c197acbb9080745fc79a4b41aaa5452e /vendor/github.com/uptrace/bun/migrate/migrator.go | |
| parent | update sqlite library -> v1.13.0 (diff) | |
| parent | Merge pull request #195 from NyaaaWhatsUpDoc/update/bun-library (diff) | |
| download | gotosocial-6a2d0d9508392425392738743fa4dd5b5d93bdb4.tar.xz | |
Merge remote-tracking branch 'upstream/main' into update/sqlite-library
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
Diffstat (limited to 'vendor/github.com/uptrace/bun/migrate/migrator.go')
| -rw-r--r-- | vendor/github.com/uptrace/bun/migrate/migrator.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vendor/github.com/uptrace/bun/migrate/migrator.go b/vendor/github.com/uptrace/bun/migrate/migrator.go index f9b4a51c2..1808d9db8 100644 --- a/vendor/github.com/uptrace/bun/migrate/migrator.go +++ b/vendor/github.com/uptrace/bun/migrate/migrator.go @@ -115,6 +115,7 @@ func (m *Migrator) Reset(ctx context.Context) error { return m.Init(ctx) } +// Migrate runs unapplied migrations. If a migration fails, migrate immediately exits. func (m *Migrator) Migrate(ctx context.Context, opts ...MigrationOption) (*MigrationGroup, error) { cfg := newMigrationConfig(opts) @@ -146,7 +147,7 @@ func (m *Migrator) Migrate(ctx context.Context, opts ...MigrationOption) (*Migra if !cfg.nop && migration.Up != nil { if err := migration.Up(ctx, m.db); err != nil { - return nil, err + return group, err } } |