Skip to content

Fix migration order v1.3 #3157

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 7 commits into from
Dec 12, 2017
Merged

Fix migration order v1.3 #3157

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1564b1
FIx migration order
lafriks Dec 11, 2017
2c5305e
Fix migration function file names to match version
lafriks Dec 11, 2017
ec73c33
Fix typo
lafriks Dec 12, 2017
563db61
Add note about ignored errors
lafriks Dec 12, 2017
51c4eb3
Fix typo, remove wrong comment
lafriks Dec 12, 2017
53a7ec4
Merge branch 'release/v1.3' into fix/rel_1_3_migration_order
lafriks Dec 12, 2017
111b0ac
Merge branch 'release/v1.3' into fix/rel_1_3_migration_order
lafriks Dec 12, 2017
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
22 changes: 16 additions & 6 deletions models/migrations/migrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ type Version struct {
Version int64
}

func emptyMigtation(x *xorm.Engine) error {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

omg :) thanks :)

return nil
}

// This is a sequence of migrations. Add new migrations to the bottom of the list.
// If you want to "retire" a migration, remove it from the top of the list and
// update minDBVersion accordingly
Expand Down Expand Up @@ -127,17 +131,17 @@ var migrations = []Migration{
// v38 -> v39
NewMigration("remove commits and settings unit types", removeCommitsUnitType),
// v39 -> v40
NewMigration("adds time tracking and stopwatches", addTimetracking),
NewMigration("fix protected branch can push value to false", fixProtectedBranchCanPushValue),
// v40 -> v41
NewMigration("migrate protected branch struct", migrateProtectedBranchStruct),
NewMigration("add tags to releases and sync existing repositories", releaseAddColumnIsTagAndSyncTags),
// v41 -> v42
NewMigration("add default value to user prohibit_login", addDefaultValueToUserProhibitLogin),
NewMigration("remove duplicate unit types", removeDuplicateUnitTypes),
// v42 -> v43
NewMigration("add tags to releases and sync existing repositories", releaseAddColumnIsTagAndSyncTags),
NewMigration("empty step", emptyMigtation),
// v43 -> v44
NewMigration("fix protected branch can push value to false", fixProtectedBranchCanPushValue),
NewMigration("empty step", emptyMigtation),
// v44 -> v45
NewMigration("remove duplicate unit types", removeDuplicateUnitTypes),
NewMigration("empty step", emptyMigtation),
// v45 -> v46
NewMigration("remove index column from repo_unit table", removeIndexColumnFromRepoUnitTable),
// v46 -> v47
Expand All @@ -146,6 +150,12 @@ var migrations = []Migration{
NewMigration("add deleted branches", addDeletedBranch),
// v48 -> v49
NewMigration("add repo indexer status", addRepoIndexerStatus),
// v49 -> v50
NewMigration("adds time tracking and stopwatches", addTimetracking),
// v50 -> v51
NewMigration("migrate protected branch struct", migrateProtectedBranchStruct),
// v51 -> v52
NewMigration("add default value to user prohibit_login", addDefaultValueToUserProhibitLogin),
}

// Migrate database to current version
Expand Down