这是indexloc提供的服务，不要输入任何密码
Skip to content

better error messages for duplicate migration versions (close #1148) #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2018
Merged

better error messages for duplicate migration versions (close #1148) #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2fcdb2
show better error messages if there are duplicate migration versions,…
arvi3411301 Dec 3, 2018
d1af285
better error message
arvi3411301 Dec 3, 2018
9fd760c
Merge branch 'master' into issue-1148
shahidhk Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cli/migrate/source/file/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ func (f *File) Open(url string, logger *log.Logger) (source.Driver, error) {
continue // ignore files that we can't parse
}

if !nf.migrations.Append(m) {
return nil, fmt.Errorf("unable to parse file %v", fi.Name())
err = nf.migrations.Append(m)
if err != nil {
return nil, err
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions cli/migrate/source/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package source

import (
"fmt"
"sort"
)

Expand Down Expand Up @@ -47,23 +48,23 @@ func NewMigrations() *Migrations {
}
}

func (i *Migrations) Append(m *Migration) (ok bool) {
func (i *Migrations) Append(m *Migration) (err error) {
if m == nil {
return false
return fmt.Errorf("migration cannot be nill")
}

if i.migrations[m.Version] == nil {
i.migrations[m.Version] = make(map[Direction]*Migration)
}

// reject duplicate versions
if _, dup := i.migrations[m.Version][m.Direction]; dup {
return false
if migration, dup := i.migrations[m.Version][m.Direction]; dup {
return fmt.Errorf("found duplicate migrations for version %d\n- %s\n- %s", m.Version, m.Raw, migration.Raw)
}

i.migrations[m.Version][m.Direction] = m
i.buildIndex()
return true
return nil
}

func (i *Migrations) buildIndex() {
Expand Down