forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main'
* upstream/main: Update Bluemonday to v1.0.19 (go-gitea#20199) Refix indices on actions table (go-gitea#20158)
- Loading branch information
Showing
7 changed files
with
68 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // Copyright 2022 The Gitea Authors. All rights reserved. | ||
| // Use of this source code is governed by a MIT-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package migrations | ||
|
|
||
| import ( | ||
| "code.gitea.io/gitea/modules/timeutil" | ||
|
|
||
| "xorm.io/xorm" | ||
| "xorm.io/xorm/schemas" | ||
| ) | ||
|
|
||
| type improveActionTableIndicesAction struct { | ||
| ID int64 `xorm:"pk autoincr"` | ||
| UserID int64 // Receiver user id. | ||
| OpType int | ||
| ActUserID int64 // Action user id. | ||
| RepoID int64 | ||
| CommentID int64 `xorm:"INDEX"` | ||
| IsDeleted bool `xorm:"NOT NULL DEFAULT false"` | ||
| RefName string | ||
| IsPrivate bool `xorm:"NOT NULL DEFAULT false"` | ||
| Content string `xorm:"TEXT"` | ||
| CreatedUnix timeutil.TimeStamp `xorm:"created"` | ||
| } | ||
|
|
||
| // TableName sets the name of this table | ||
| func (*improveActionTableIndicesAction) TableName() string { | ||
| return "action" | ||
| } | ||
|
|
||
| // TableIndices implements xorm's TableIndices interface | ||
| func (*improveActionTableIndicesAction) TableIndices() []*schemas.Index { | ||
| repoIndex := schemas.NewIndex("r_u_d", schemas.IndexType) | ||
| repoIndex.AddColumn("repo_id", "user_id", "is_deleted") | ||
|
|
||
| actUserIndex := schemas.NewIndex("au_r_c_u_d", schemas.IndexType) | ||
| actUserIndex.AddColumn("act_user_id", "repo_id", "created_unix", "user_id", "is_deleted") | ||
|
|
||
| return []*schemas.Index{actUserIndex, repoIndex} | ||
| } | ||
|
|
||
| func improveActionTableIndices(x *xorm.Engine) error { | ||
| return x.Sync2(&improveActionTableIndicesAction{}) | ||
| } |