Browse Source

Fix extra columns from `label` table (#8633)

* Fix extra fields from database

* Add migration to drop unneeded columns

* Fix lint

* Make sure the columns exist
tags/v1.11.0-rc1
guillep2k 4 years ago
parent
commit
2f10bfa0f6
3 changed files with 40 additions and 4 deletions
  1. 4
    4
      models/issue_label.go
  2. 2
    0
      models/migrations/migrations.go
  3. 34
    0
      models/migrations/v104.go

+ 4
- 4
models/issue_label.go View File

Color string `xorm:"VARCHAR(7)"` Color string `xorm:"VARCHAR(7)"`
NumIssues int NumIssues int
NumClosedIssues int NumClosedIssues int
NumOpenIssues int `xorm:"-"`
IsChecked bool `xorm:"-"`
QueryString string
IsSelected bool
NumOpenIssues int `xorm:"-"`
IsChecked bool `xorm:"-"`
QueryString string `xorm:"-"`
IsSelected bool `xorm:"-"`
} }


// APIFormat converts a Label to the api.Label format // APIFormat converts a Label to the api.Label format

+ 2
- 0
models/migrations/migrations.go View File

NewMigration("update migration repositories' service type", dropColumnHeadUserNameOnPullRequest), NewMigration("update migration repositories' service type", dropColumnHeadUserNameOnPullRequest),
// v103 -> v104 // v103 -> v104
NewMigration("Add WhitelistDeployKeys to protected branch", addWhitelistDeployKeysToBranches), NewMigration("Add WhitelistDeployKeys to protected branch", addWhitelistDeployKeysToBranches),
// v104 -> v105
NewMigration("remove unnecessary columns from label", removeLabelUneededCols),
} }


// Migrate database to current version // Migrate database to current version

+ 34
- 0
models/migrations/v104.go View File

// Copyright 2019 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 removeLabelUneededCols(x *xorm.Engine) error {

// Make sure the columns exist before dropping them
type Label struct {
QueryString string
IsSelected bool
}
if err := x.Sync2(new(Label)); err != nil {
return err
}

sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
return err
}
if err := dropTableColumns(sess, "label", "query_string"); err != nil {
return err
}
if err := dropTableColumns(sess, "label", "is_selected"); err != nil {
return err
}
return sess.Commit()
}

Loading…
Cancel
Save