GOMODULES
/
goose
mirror of https://github.com/pressly/goose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make NumericComponent errors more understandable (#334)

pull/342/head
Zeal Wierslee 2022-04-29 10:22:52 -04:00 committed by GitHub
parent 1311a0eb13
commit 33487e40af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migrate.go
View File

@ -156,7 +156,7 @@ func collectMigrationsFS(fsys fs.FS, dirpath string, current, target int64) (Mig
for _, file := range sqlMigrationFiles { for _, file := range sqlMigrationFiles {
v, err := NumericComponent(file) v, err := NumericComponent(file)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("could not parse SQL migration file %q: %w", file, err)
} }
if versionFilter(v, current, target) { if versionFilter(v, current, target) {
migration := &Migration{Version: v, Next: -1, Previous: -1, Source: file} migration := &Migration{Version: v, Next: -1, Previous: -1, Source: file}
@ -168,7 +168,7 @@ func collectMigrationsFS(fsys fs.FS, dirpath string, current, target int64) (Mig
for _, migration := range registeredGoMigrations { for _, migration := range registeredGoMigrations {
v, err := NumericComponent(migration.Source) v, err := NumericComponent(migration.Source)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("could not parse go migration file %q: %w", migration.Source, err)
} }
if versionFilter(v, current, target) { if versionFilter(v, current, target) {
migrations = append(migrations, migration) migrations = append(migrations, migration)

2
migration.go
View File

@ -137,7 +137,7 @@ func NumericComponent(name string) (int64, error) {
idx := strings.Index(base, "_") idx := strings.Index(base, "_")
if idx < 0 { if idx < 0 {
return 0, errors.New("no separator found") return 0, errors.New("no filename separator '_' found")
} }
n, e := strconv.ParseInt(base[:idx], 10, 64) n, e := strconv.ParseInt(base[:idx], 10, 64)