Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add mssql migration tests (#6852)
  • Loading branch information
zeripath authored and lafriks committed May 5, 2019
1 parent 722a2bd commit 0081cd8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
14 changes: 7 additions & 7 deletions integrations/migration-test/migration_test.go
Expand Up @@ -13,6 +13,7 @@ import (
"path"
"regexp"
"sort"
"strings"
"testing"

"code.gitea.io/gitea/integrations"
Expand Down Expand Up @@ -120,8 +121,7 @@ func readSQLFromFile(version string) (string, error) {
if err != nil {
return "", err
}

return string(bytes), nil
return string(base.RemoveBOMIfPresent(bytes)), nil
}

func restoreOldDB(t *testing.T, version string) bool {
Expand Down Expand Up @@ -199,11 +199,11 @@ func restoreOldDB(t *testing.T, version string) bool {
_, err = db.Exec("DROP DATABASE IF EXISTS gitea")
assert.NoError(t, err)

_, err = db.Exec("CREATE DATABASE gitea")
assert.NoError(t, err)

_, err = db.Exec(data)
assert.NoError(t, err)
statements := strings.Split(data, "\nGO\n")
for _, statement := range statements {
_, err = db.Exec(statement)
assert.NoError(t, err, "Failure whilst running: %s\nError: %v", statement, err)
}
db.Close()
}
return true
Expand Down
2 changes: 1 addition & 1 deletion models/migrations/migrations.go
Expand Up @@ -264,7 +264,7 @@ Please try to upgrade to a lower version (>= v0.6.0) first, then upgrade to curr
return err
}
for i, m := range migrations[v-minDBVersion:] {
log.Info("Migration: %s", m.Description())
log.Info("Migration[%d]: %s", v+int64(i), m.Description())
if err = m.Migrate(x); err != nil {
return fmt.Errorf("do migrate: %v", err)
}
Expand Down

0 comments on commit 0081cd8

Please sign in to comment.