Skip to content

Commit

Permalink
Drop the correct deleted branch table (#26028)
Browse files Browse the repository at this point in the history
There's a typo in #22743
The correct table name is `deleted_branch` not `deleted_branches`
  • Loading branch information
yp05327 authored Jul 26, 2023
1 parent d36ddfe commit 74ca437
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,8 @@ var migrations = []Migration{
NewMigration("Add action_tasks_version table", v1_21.CreateActionTasksVersionTable),
// v268 -> v269
NewMigration("Update Action Ref", v1_21.UpdateActionsRefIndex),
// v269 -> v270
NewMigration("Drop deleted branch table", v1_21.DropDeletedBranchTable),
}

// GetCurrentDBVersion returns the current db version
Expand Down
2 changes: 1 addition & 1 deletion models/migrations/v1_21/v264.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,5 @@ func AddBranchTable(x *xorm.Engine) error {
}
}

return x.DropTables("deleted_branches")
return x.DropTables(new(DeletedBranch))
}
12 changes: 12 additions & 0 deletions models/migrations/v1_21/v269.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

package v1_21 //nolint

import (
"xorm.io/xorm"
)

func DropDeletedBranchTable(x *xorm.Engine) error {
return x.DropTables("deleted_branch")
}

0 comments on commit 74ca437

Please sign in to comment.