Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kyrcha committed Oct 15, 2019
2 parents 97a5fbe + 73985d0 commit 4a8094e
Show file tree
Hide file tree
Showing 4 changed files with 183 additions and 128 deletions.
8 changes: 7 additions & 1 deletion database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,11 @@ func Migrate(databaseURL string) error {
if err != nil {
return err
}
return m.Up()

if err := m.Up(); err != nil && err != migrate.ErrNoChange {
return err
}

_, err = m.Close()
return err
}
3 changes: 1 addition & 2 deletions examples/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"sync"
"sync/atomic"

"github.com/golang-migrate/migrate/v4"
"github.com/src-d/metadata-retrieval/database"
"github.com/src-d/metadata-retrieval/github"
"golang.org/x/oauth2"
Expand Down Expand Up @@ -207,7 +206,7 @@ func (c *DownloaderCmd) ExecuteBody(logger log.Logger, fn bodyFunc) error {
return err
}

if err = database.Migrate(c.DB); err != nil && err != migrate.ErrNoChange {
if err = database.Migrate(c.DB); err != nil {
return err
}
}
Expand Down
Loading

0 comments on commit 4a8094e

Please sign in to comment.