mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
chore(models): rewrite code format. (#14754)
* chore: rewrite format. * chore: update format Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com> * chore: update format Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com> * chore: Adjacent parameters with the same type should be grouped together * chore: update format.
This commit is contained in:
@@ -26,7 +26,7 @@ func updateMigrationServiceTypes(x *xorm.Engine) error {
|
||||
var last int
|
||||
const batchSize = 50
|
||||
for {
|
||||
var results = make([]Repository, 0, batchSize)
|
||||
results := make([]Repository, 0, batchSize)
|
||||
err := x.Where("original_url <> '' AND original_url IS NOT NULL").
|
||||
And("original_service_type = 0 OR original_service_type IS NULL").
|
||||
OrderBy("id").
|
||||
@@ -48,7 +48,7 @@ func updateMigrationServiceTypes(x *xorm.Engine) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var serviceType = PlainGitService
|
||||
serviceType := PlainGitService
|
||||
if strings.EqualFold(u.Host, "github.com") {
|
||||
serviceType = GithubService
|
||||
}
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func removeLabelUneededCols(x *xorm.Engine) error {
|
||||
|
||||
// Make sure the columns exist before dropping them
|
||||
type Label struct {
|
||||
QueryString string
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func addTeamIncludesAllRepositories(x *xorm.Engine) error {
|
||||
|
||||
type Team struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
IncludesAllRepositories bool `xorm:"NOT NULL DEFAULT false"`
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func addTemplateToRepo(x *xorm.Engine) error {
|
||||
|
||||
type Repository struct {
|
||||
IsTemplate bool `xorm:"INDEX NOT NULL DEFAULT false"`
|
||||
TemplateID int64 `xorm:"INDEX"`
|
||||
|
@@ -380,7 +380,7 @@ func addBranchProtectionCanPushAndEnableWhitelist(x *xorm.Engine) error {
|
||||
}
|
||||
totalPages := totalIssues / pageSize
|
||||
|
||||
var executeBody = func(page, pageSize int64) error {
|
||||
executeBody := func(page, pageSize int64) error {
|
||||
// Find latest review of each user in each pull request, and set official field if appropriate
|
||||
reviews := []*Review{}
|
||||
|
||||
|
@@ -11,7 +11,6 @@ import (
|
||||
)
|
||||
|
||||
func sanitizeOriginalURL(x *xorm.Engine) error {
|
||||
|
||||
type Repository struct {
|
||||
ID int64
|
||||
OriginalURL string `xorm:"VARCHAR(2048)"`
|
||||
@@ -20,7 +19,7 @@ func sanitizeOriginalURL(x *xorm.Engine) error {
|
||||
var last int
|
||||
const batchSize = 50
|
||||
for {
|
||||
var results = make([]Repository, 0, batchSize)
|
||||
results := make([]Repository, 0, batchSize)
|
||||
err := x.Where("original_url <> '' AND original_url IS NOT NULL").
|
||||
And("original_service_type = 0 OR original_service_type IS NULL").
|
||||
OrderBy("id").
|
||||
|
@@ -151,7 +151,7 @@ func copyOldAvatarToNewLocation(userID int64, oldAvatar string) (string, error)
|
||||
return newAvatar, nil
|
||||
}
|
||||
|
||||
if err := ioutil.WriteFile(filepath.Join(setting.Avatar.Path, newAvatar), data, 0666); err != nil {
|
||||
if err := ioutil.WriteFile(filepath.Join(setting.Avatar.Path, newAvatar), data, 0o666); err != nil {
|
||||
return "", fmt.Errorf("ioutil.WriteFile: %v", err)
|
||||
}
|
||||
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func extendTrackedTimes(x *xorm.Engine) error {
|
||||
|
||||
type TrackedTime struct {
|
||||
Time int64 `xorm:"NOT NULL"`
|
||||
Deleted bool `xorm:"NOT NULL DEFAULT false"`
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func addRequireSignedCommits(x *xorm.Engine) error {
|
||||
|
||||
type ProtectedBranch struct {
|
||||
RequireSignedCommits bool `xorm:"NOT NULL DEFAULT false"`
|
||||
}
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func addUserRepoMissingColumns(x *xorm.Engine) error {
|
||||
|
||||
type VisibleType int
|
||||
type User struct {
|
||||
PasswdHashAlgo string `xorm:"NOT NULL DEFAULT 'pbkdf2'"`
|
||||
|
@@ -40,7 +40,7 @@ func fixMergeBase(x *xorm.Engine) error {
|
||||
MergedCommitID string `xorm:"VARCHAR(40)"`
|
||||
}
|
||||
|
||||
var limit = setting.Database.IterateBufferSize
|
||||
limit := setting.Database.IterateBufferSize
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func purgeUnusedDependencies(x *xorm.Engine) error {
|
||||
|
||||
if _, err := x.Exec("DELETE FROM issue_dependency WHERE issue_id NOT IN (SELECT id FROM issue)"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
@@ -12,7 +12,6 @@ import (
|
||||
)
|
||||
|
||||
func expandWebhooks(x *xorm.Engine) error {
|
||||
|
||||
type HookEvents struct {
|
||||
Create bool `json:"create"`
|
||||
Delete bool `json:"delete"`
|
||||
@@ -57,7 +56,7 @@ func expandWebhooks(x *xorm.Engine) error {
|
||||
if err := sess.Begin(); err != nil {
|
||||
return err
|
||||
}
|
||||
var results = make([]Webhook, 0, batchSize)
|
||||
results := make([]Webhook, 0, batchSize)
|
||||
err := x.OrderBy("id").
|
||||
Limit(batchSize, last).
|
||||
Find(&results)
|
||||
|
@@ -40,7 +40,7 @@ func refixMergeBase(x *xorm.Engine) error {
|
||||
MergedCommitID string `xorm:"VARCHAR(40)"`
|
||||
}
|
||||
|
||||
var limit = setting.Database.IterateBufferSize
|
||||
limit := setting.Database.IterateBufferSize
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
|
@@ -65,7 +65,7 @@ func addCommitDivergenceToPulls(x *xorm.Engine) error {
|
||||
if err := sess.Begin(); err != nil {
|
||||
return err
|
||||
}
|
||||
var results = make([]*PullRequest, 0, batchSize)
|
||||
results := make([]*PullRequest, 0, batchSize)
|
||||
err := sess.Where("has_merged = ?", false).OrderBy("id").Limit(batchSize, last).Find(&results)
|
||||
if err != nil {
|
||||
return err
|
||||
|
@@ -11,7 +11,7 @@ import (
|
||||
)
|
||||
|
||||
func updateMatrixWebhookHTTPMethod(x *xorm.Engine) error {
|
||||
var matrixHookTaskType = 9 // value comes from the models package
|
||||
matrixHookTaskType := 9 // value comes from the models package
|
||||
type Webhook struct {
|
||||
HTTPMethod string
|
||||
}
|
||||
|
@@ -11,7 +11,6 @@ import (
|
||||
)
|
||||
|
||||
func addProjectsInfo(x *xorm.Engine) error {
|
||||
|
||||
// Create new tables
|
||||
type (
|
||||
ProjectType uint8
|
||||
|
@@ -83,7 +83,7 @@ func createReviewsForCodeComments(x *xorm.Engine) error {
|
||||
return err
|
||||
}
|
||||
|
||||
var updateComment = func(comments []*Comment) error {
|
||||
updateComment := func(comments []*Comment) error {
|
||||
sess := x.NewSession()
|
||||
defer sess.Close()
|
||||
if err := sess.Begin(); err != nil {
|
||||
@@ -131,10 +131,10 @@ func createReviewsForCodeComments(x *xorm.Engine) error {
|
||||
return sess.Commit()
|
||||
}
|
||||
|
||||
var start = 0
|
||||
var batchSize = 100
|
||||
start := 0
|
||||
batchSize := 100
|
||||
for {
|
||||
var comments = make([]*Comment, 0, batchSize)
|
||||
comments := make([]*Comment, 0, batchSize)
|
||||
if err := x.Where("review_id = 0 and type = 21").Limit(batchSize, start).Find(&comments); err != nil {
|
||||
return err
|
||||
}
|
||||
|
@@ -26,7 +26,6 @@ func userPath(userName string) string {
|
||||
}
|
||||
|
||||
func fixPublisherIDforTagReleases(x *xorm.Engine) error {
|
||||
|
||||
type Release struct {
|
||||
ID int64
|
||||
RepoID int64
|
||||
|
@@ -9,7 +9,6 @@ import (
|
||||
)
|
||||
|
||||
func fixRepoTopics(x *xorm.Engine) error {
|
||||
|
||||
type Topic struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
Name string `xorm:"UNIQUE VARCHAR(25)"`
|
||||
|
@@ -51,10 +51,12 @@ func updateCodeCommentReplies(x *xorm.Engine) error {
|
||||
AND comment.id != first.id
|
||||
AND comment.commit_sha != first.commit_sha`
|
||||
|
||||
var sqlCmd string
|
||||
var start = 0
|
||||
var batchSize = 100
|
||||
sess := x.NewSession()
|
||||
var (
|
||||
sqlCmd string
|
||||
start = 0
|
||||
batchSize = 100
|
||||
sess = x.NewSession()
|
||||
)
|
||||
defer sess.Close()
|
||||
for {
|
||||
if err := sess.Begin(); err != nil {
|
||||
@@ -68,7 +70,7 @@ func updateCodeCommentReplies(x *xorm.Engine) error {
|
||||
}
|
||||
}
|
||||
|
||||
var comments = make([]*Comment, 0, batchSize)
|
||||
comments := make([]*Comment, 0, batchSize)
|
||||
|
||||
switch {
|
||||
case setting.Database.UseMySQL:
|
||||
|
@@ -21,7 +21,7 @@ func convertTaskTypeToString(x *xorm.Engine) error {
|
||||
MATRIX
|
||||
)
|
||||
|
||||
var hookTaskTypes = map[int]string{
|
||||
hookTaskTypes := map[int]string{
|
||||
GITEA: "gitea",
|
||||
GOGS: "gogs",
|
||||
SLACK: "slack",
|
||||
|
@@ -21,7 +21,7 @@ func convertWebhookTaskTypeToString(x *xorm.Engine) error {
|
||||
MATRIX
|
||||
)
|
||||
|
||||
var hookTaskTypes = map[int]string{
|
||||
hookTaskTypes := map[int]string{
|
||||
GITEA: "gitea",
|
||||
GOGS: "gogs",
|
||||
SLACK: "slack",
|
||||
|
@@ -14,7 +14,6 @@ import (
|
||||
)
|
||||
|
||||
func addIssueDependencies(x *xorm.Engine) (err error) {
|
||||
|
||||
type IssueDependency struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
UserID int64 `xorm:"NOT NULL"`
|
||||
@@ -90,7 +89,7 @@ func addIssueDependencies(x *xorm.Engine) (err error) {
|
||||
Created time.Time `xorm:"-"`
|
||||
}
|
||||
|
||||
//Updating existing issue units
|
||||
// Updating existing issue units
|
||||
units := make([]*RepoUnit, 0, 100)
|
||||
err = x.Where("`type` = ?", v16UnitTypeIssues).Find(&units)
|
||||
if err != nil {
|
||||
|
@@ -79,7 +79,6 @@ func addScratchHash(x *xorm.Engine) error {
|
||||
return err
|
||||
}
|
||||
return sess.Commit()
|
||||
|
||||
}
|
||||
|
||||
func hashToken(token, salt string) string {
|
||||
|
@@ -40,7 +40,7 @@ func addPullRequestRebaseWithMerge(x *xorm.Engine) error {
|
||||
return err
|
||||
}
|
||||
|
||||
//Updating existing issue units
|
||||
// Updating existing issue units
|
||||
units := make([]*RepoUnit, 0, 100)
|
||||
if err := sess.Where("`type` = ?", v16UnitTypePRs).Find(&units); err != nil {
|
||||
return fmt.Errorf("Query repo units: %v", err)
|
||||
|
@@ -11,7 +11,6 @@ import (
|
||||
)
|
||||
|
||||
func addCanCloseIssuesViaCommitInAnyBranch(x *xorm.Engine) error {
|
||||
|
||||
type Repository struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
CloseIssuesViaCommitInAnyBranch bool `xorm:"NOT NULL DEFAULT false"`
|
||||
|
@@ -29,9 +29,9 @@ func addCommitStatusContext(x *xorm.Engine) error {
|
||||
sess := x.NewSession()
|
||||
defer sess.Close()
|
||||
|
||||
var start = 0
|
||||
start := 0
|
||||
for {
|
||||
var statuses = make([]*CommitStatus, 0, 100)
|
||||
statuses := make([]*CommitStatus, 0, 100)
|
||||
err := sess.OrderBy("id").Limit(100, start).Find(&statuses)
|
||||
if err != nil {
|
||||
return err
|
||||
|
@@ -10,7 +10,6 @@ import (
|
||||
)
|
||||
|
||||
func removeLingeringIndexStatus(x *xorm.Engine) error {
|
||||
|
||||
_, err := x.Exec(builder.Delete(builder.NotIn("`repo_id`", builder.Select("`id`").From("`repository`"))).From("`repo_indexer_status`"))
|
||||
return err
|
||||
}
|
||||
|
@@ -25,7 +25,7 @@ func deleteOrphanedAttachments(x *xorm.Engine) error {
|
||||
sess := x.NewSession()
|
||||
defer sess.Close()
|
||||
|
||||
var limit = setting.Database.IterateBufferSize
|
||||
limit := setting.Database.IterateBufferSize
|
||||
if limit <= 0 {
|
||||
limit = 50
|
||||
}
|
||||
@@ -42,7 +42,7 @@ func deleteOrphanedAttachments(x *xorm.Engine) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
var ids = make([]int64, 0, limit)
|
||||
ids := make([]int64, 0, limit)
|
||||
for _, attachment := range attachements {
|
||||
ids = append(ids, attachment.ID)
|
||||
}
|
||||
|
Reference in New Issue
Block a user