summaryrefslogtreecommitdiff
path: root/vendor/github.com/uptrace/bun/migrate/migrations.go
diff options
context:
space:
mode:
authorLibravatar kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>2022-09-28 18:30:40 +0100
committerLibravatar GitHub <noreply@github.com>2022-09-28 18:30:40 +0100
commita156188b3eb5cb3da44aa1b7452265f5fa38a607 (patch)
tree7097fa48d56fbabc7c2c8750b1f3bc9321d71c0f /vendor/github.com/uptrace/bun/migrate/migrations.go
parent[bugfix] Fix emphasis being added to emoji shortcodes with markdown parsing (... (diff)
downloadgotosocial-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/migrations.go')
-rw-r--r--vendor/github.com/uptrace/bun/migrate/migrations.go21
1 files changed, 12 insertions, 9 deletions
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
}