-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-13939-make-2fa-optional-inc-ldap
- Loading branch information
Showing
51 changed files
with
647 additions
and
723 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
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,33 @@ | ||
| // Copyright 2021 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 ( | ||
| "xorm.io/xorm" | ||
| ) | ||
|
|
||
| func addRepoIDForAttachment(x *xorm.Engine) error { | ||
| type Attachment struct { | ||
| ID int64 `xorm:"pk autoincr"` | ||
| UUID string `xorm:"uuid UNIQUE"` | ||
| RepoID int64 `xorm:"INDEX"` // this should not be zero | ||
| IssueID int64 `xorm:"INDEX"` // maybe zero when creating | ||
| ReleaseID int64 `xorm:"INDEX"` // maybe zero when creating | ||
| UploaderID int64 `xorm:"INDEX DEFAULT 0"` | ||
| } | ||
| if err := x.Sync2(new(Attachment)); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if _, err := x.Exec("UPDATE `attachment` set repo_id = (SELECT repo_id FROM `issue` WHERE `issue`.id = `attachment`.issue_id) WHERE `attachment`.issue_id > 0"); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if _, err := x.Exec("UPDATE `attachment` set repo_id = (SELECT repo_id FROM `release` WHERE `release`.id = `attachment`.release_id) WHERE `attachment`.release_id > 0"); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } |
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,71 @@ | ||
| // Copyright 2021 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 ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func Test_addRepoIDForAttachment(t *testing.T) { | ||
| type Attachment struct { | ||
| ID int64 `xorm:"pk autoincr"` | ||
| UUID string `xorm:"uuid UNIQUE"` | ||
| RepoID int64 `xorm:"INDEX"` // this should not be zero | ||
| IssueID int64 `xorm:"INDEX"` // maybe zero when creating | ||
| ReleaseID int64 `xorm:"INDEX"` // maybe zero when creating | ||
| UploaderID int64 `xorm:"INDEX DEFAULT 0"` | ||
| } | ||
|
|
||
| type Issue struct { | ||
| ID int64 | ||
| RepoID int64 | ||
| } | ||
|
|
||
| type Release struct { | ||
| ID int64 | ||
| RepoID int64 | ||
| } | ||
|
|
||
| // Prepare and load the testing database | ||
| x, deferrable := prepareTestEnv(t, 0, new(Attachment), new(Issue), new(Release)) | ||
| defer deferrable() | ||
| if x == nil || t.Failed() { | ||
| return | ||
| } | ||
|
|
||
| // Run the migration | ||
| if err := addRepoIDForAttachment(x); err != nil { | ||
| assert.NoError(t, err) | ||
| return | ||
| } | ||
|
|
||
| var issueAttachments []*Attachment | ||
| err := x.Where("issue_id > 0").Find(&issueAttachments) | ||
| assert.NoError(t, err) | ||
| for _, attach := range issueAttachments { | ||
| assert.Greater(t, attach.RepoID, 0) | ||
| assert.Greater(t, attach.IssueID, 0) | ||
| var issue Issue | ||
| has, err := x.ID(attach.IssueID).Get(&issue) | ||
| assert.NoError(t, err) | ||
| assert.True(t, has) | ||
| assert.EqualValues(t, attach.RepoID, issue.RepoID) | ||
| } | ||
|
|
||
| var releaseAttachments []*Attachment | ||
| err = x.Where("release_id > 0").Find(&releaseAttachments) | ||
| assert.NoError(t, err) | ||
| for _, attach := range releaseAttachments { | ||
| assert.Greater(t, attach.RepoID, 0) | ||
| assert.Greater(t, attach.IssueID, 0) | ||
| var release Release | ||
| has, err := x.ID(attach.ReleaseID).Get(&release) | ||
| assert.NoError(t, err) | ||
| assert.True(t, has) | ||
| assert.EqualValues(t, attach.RepoID, release.RepoID) | ||
| } | ||
| } |
Oops, something went wrong.