diff options
| author | zeripath <art27@cantab.net> | 2019-05-06 00:42:29 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-05-06 02:42:29 +0300 |
| commit | 0081cd8dfe34bcd9182ccebb406000c17dcb8025 (patch) | |
| tree | 773754ab8283a4a9200a92ecac9d7082e22471fa | |
| parent | 722a2bd7ec742c7e421a33ee639fcfcf1e8f6efa (diff) | |
| download | gitea-0081cd8dfe34bcd9182ccebb406000c17dcb8025.tar.gz gitea-0081cd8dfe34bcd9182ccebb406000c17dcb8025.zip | |
Add mssql migration tests (#6852)
| -rw-r--r-- | integrations/migration-test/gitea-v1.5.3.mssql.sql.gz | bin | 0 -> 12747 bytes | |||
| -rw-r--r-- | integrations/migration-test/gitea-v1.6.4.mssql.sql.gz | bin | 0 -> 13275 bytes | |||
| -rw-r--r-- | integrations/migration-test/gitea-v1.7.0.mssql.sql.gz | bin | 0 -> 13385 bytes | |||
| -rw-r--r-- | integrations/migration-test/migration_test.go | 14 | ||||
| -rw-r--r-- | models/migrations/migrations.go | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/integrations/migration-test/gitea-v1.5.3.mssql.sql.gz b/integrations/migration-test/gitea-v1.5.3.mssql.sql.gz Binary files differnew file mode 100644 index 0000000000..90c1674066 --- /dev/null +++ b/integrations/migration-test/gitea-v1.5.3.mssql.sql.gz diff --git a/integrations/migration-test/gitea-v1.6.4.mssql.sql.gz b/integrations/migration-test/gitea-v1.6.4.mssql.sql.gz Binary files differnew file mode 100644 index 0000000000..1f43e2e643 --- /dev/null +++ b/integrations/migration-test/gitea-v1.6.4.mssql.sql.gz diff --git a/integrations/migration-test/gitea-v1.7.0.mssql.sql.gz b/integrations/migration-test/gitea-v1.7.0.mssql.sql.gz Binary files differnew file mode 100644 index 0000000000..87499d2ac8 --- /dev/null +++ b/integrations/migration-test/gitea-v1.7.0.mssql.sql.gz diff --git a/integrations/migration-test/migration_test.go b/integrations/migration-test/migration_test.go index fafe0fe225..f168424865 100644 --- a/integrations/migration-test/migration_test.go +++ b/integrations/migration-test/migration_test.go @@ -13,6 +13,7 @@ import ( "path" "regexp" "sort" + "strings" "testing" "code.gitea.io/gitea/integrations" @@ -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 { @@ -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 diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index b86c20576f..f3a090e41c 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -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) } |