Skip to content

Commit 0081cd8

Browse files
zeripathlafriks
authored andcommitted
Add mssql migration tests (#6852)
1 parent 722a2bd commit 0081cd8

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.

integrations/migration-test/migration_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"path"
1414
"regexp"
1515
"sort"
16+
"strings"
1617
"testing"
1718

1819
"code.gitea.io/gitea/integrations"
@@ -120,8 +121,7 @@ func readSQLFromFile(version string) (string, error) {
120121
if err != nil {
121122
return "", err
122123
}
123-
124-
return string(bytes), nil
124+
return string(base.RemoveBOMIfPresent(bytes)), nil
125125
}
126126

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

202-
_, err = db.Exec("CREATE DATABASE gitea")
203-
assert.NoError(t, err)
204-
205-
_, err = db.Exec(data)
206-
assert.NoError(t, err)
202+
statements := strings.Split(data, "\nGO\n")
203+
for _, statement := range statements {
204+
_, err = db.Exec(statement)
205+
assert.NoError(t, err, "Failure whilst running: %s\nError: %v", statement, err)
206+
}
207207
db.Close()
208208
}
209209
return true

models/migrations/migrations.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ Please try to upgrade to a lower version (>= v0.6.0) first, then upgrade to curr
264264
return err
265265
}
266266
for i, m := range migrations[v-minDBVersion:] {
267-
log.Info("Migration: %s", m.Description())
267+
log.Info("Migration[%d]: %s", v+int64(i), m.Description())
268268
if err = m.Migrate(x); err != nil {
269269
return fmt.Errorf("do migrate: %v", err)
270270
}

0 commit comments

Comments
 (0)