diff options
| author | 2022-09-28 18:30:40 +0100 | |
|---|---|---|
| committer | 2022-09-28 18:30:40 +0100 | |
| commit | a156188b3eb5cb3da44aa1b7452265f5fa38a607 (patch) | |
| tree | 7097fa48d56fbabc7c2c8750b1f3bc9321d71c0f /vendor/github.com/uptrace/bun/migrate | |
| parent | [bugfix] Fix emphasis being added to emoji shortcodes with markdown parsing (... (diff) | |
| download | gotosocial-a156188b3eb5cb3da44aa1b7452265f5fa38a607.tar.xz | |
[chore] update dependencies, bump to Go 1.19.1 (#826)
* update dependencies, bump Go version to 1.19
* bump test image Go version
* update golangci-lint
* update gotosocial-drone-build
* sign
* linting, go fmt
* update swagger docs
* update swagger docs
* whitespace
* update contributing.md
* fuckin whoopsie doopsie
* linterino, linteroni
* fix followrequest test not starting processor
* fix other api/client tests not starting processor
* fix remaining tests where processor not started
* bump go-runners version
* don't check last-webfingered-at, processor may have updated this
* update swagger command
* update bun to latest version
* fix embed to work the same as before with new bun
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
Diffstat (limited to 'vendor/github.com/uptrace/bun/migrate')
| -rw-r--r-- | vendor/github.com/uptrace/bun/migrate/migration.go | 3 | ||||
| -rw-r--r-- | vendor/github.com/uptrace/bun/migrate/migrations.go | 21 | ||||
| -rw-r--r-- | vendor/github.com/uptrace/bun/migrate/migrator.go | 29 |
3 files changed, 40 insertions, 13 deletions
diff --git a/vendor/github.com/uptrace/bun/migrate/migration.go b/vendor/github.com/uptrace/bun/migrate/migration.go index ae649446d..a581098a3 100644 --- a/vendor/github.com/uptrace/bun/migrate/migration.go +++ b/vendor/github.com/uptrace/bun/migrate/migration.go @@ -18,6 +18,7 @@ type Migration struct { ID int64 `bun:",pk,autoincrement"` Name string + Comment string `bun:"-"` GroupID int64 MigratedAt time.Time `bun:",notnull,nullzero,default:current_timestamp"` @@ -26,7 +27,7 @@ type Migration struct { } func (m Migration) String() string { - return m.Name + return fmt.Sprintf("%s_%s", m.Name, m.Comment) } func (m Migration) IsApplied() bool { diff --git a/vendor/github.com/uptrace/bun/migrate/migrations.go b/vendor/github.com/uptrace/bun/migrate/migrations.go index 9af861048..0e26a09cc 100644 --- a/vendor/github.com/uptrace/bun/migrate/migrations.go +++ b/vendor/github.com/uptrace/bun/migrate/migrations.go @@ -50,15 +50,16 @@ func (m *Migrations) MustRegister(up, down MigrationFunc) { func (m *Migrations) Register(up, down MigrationFunc) error { fpath := migrationFile() - name, err := extractMigrationName(fpath) + name, comment, err := extractMigrationName(fpath) if err != nil { return err } m.Add(Migration{ - Name: name, - Up: up, - Down: down, + Name: name, + Comment: comment, + Up: up, + Down: down, }) return nil @@ -89,7 +90,7 @@ func (m *Migrations) Discover(fsys fs.FS) error { return nil } - name, err := extractMigrationName(path) + name, comment, err := extractMigrationName(path) if err != nil { return err } @@ -98,6 +99,8 @@ func (m *Migrations) Discover(fsys fs.FS) error { if err != nil { return err } + + migration.Comment = comment migrationFunc := NewSQLMigrationFunc(fsys, path) if strings.HasSuffix(path, ".up.sql") { @@ -154,15 +157,15 @@ func migrationFile() string { return "" } -var fnameRE = regexp.MustCompile(`^(\d{14})_[0-9a-z_\-]+\.`) +var fnameRE = regexp.MustCompile(`^(\d{14})_([0-9a-z_\-]+)\.`) -func extractMigrationName(fpath string) (string, error) { +func extractMigrationName(fpath string) (string, string, error) { fname := filepath.Base(fpath) matches := fnameRE.FindStringSubmatch(fname) if matches == nil { - return "", fmt.Errorf("migrate: unsupported migration name format: %q", fname) + return "", "", fmt.Errorf("migrate: unsupported migration name format: %q", fname) } - return matches[1], nil + return matches[1], matches[2], nil } diff --git a/vendor/github.com/uptrace/bun/migrate/migrator.go b/vendor/github.com/uptrace/bun/migrate/migrator.go index d0efca2fc..98d8f434e 100644 --- a/vendor/github.com/uptrace/bun/migrate/migrator.go +++ b/vendor/github.com/uptrace/bun/migrate/migrator.go @@ -74,7 +74,7 @@ func (m *Migrator) MigrationsWithStatus(ctx context.Context) (MigrationSlice, er func (m *Migrator) migrationsWithStatus(ctx context.Context) (MigrationSlice, int64, error) { sorted := m.migrations.Sorted() - applied, err := m.selectAppliedMigrations(ctx) + applied, err := m.AppliedMigrations(ctx) if err != nil { return nil, 0, err } @@ -338,8 +338,31 @@ func (m *Migrator) MarkUnapplied(ctx context.Context, migration *Migration) erro return err } -// selectAppliedMigrations selects applied (applied) migrations in descending order. -func (m *Migrator) selectAppliedMigrations(ctx context.Context) (MigrationSlice, error) { +func (m *Migrator) TruncateTable(ctx context.Context) error { + _, err := m.db.NewTruncateTable().TableExpr(m.table).Exec(ctx) + return err +} + +// MissingMigrations returns applied migrations that can no longer be found. +func (m *Migrator) MissingMigrations(ctx context.Context) (MigrationSlice, error) { + applied, err := m.AppliedMigrations(ctx) + if err != nil { + return nil, err + } + + existing := migrationMap(m.migrations.ms) + for i := len(applied) - 1; i >= 0; i-- { + m := &applied[i] + if _, ok := existing[m.Name]; ok { + applied = append(applied[:i], applied[i+1:]...) + } + } + + return applied, nil +} + +// AppliedMigrations selects applied (applied) migrations in descending order. +func (m *Migrator) AppliedMigrations(ctx context.Context) (MigrationSlice, error) { var ms MigrationSlice if err := m.db.NewSelect(). ColumnExpr("*"). |
