Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Fix migration v141 (#14387) (#14388)

Browse source 
* Fix mig 141

* temporary fix dump
This commit is contained in:
6543 2021-01-23 12:33:03 +01:00 committed by GitHub
parent 841efac895
commit 00dc35e2de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/migrations/v141.go
View file

@ -12,7 +12,7 @@ import (
func addKeepActivityPrivateUserColumn(x *xorm.Engine) error { func addKeepActivityPrivateUserColumn(x *xorm.Engine) error {
type User struct { type User struct {
KeepActivityPrivate bool KeepActivityPrivate bool `xorm:"NOT NULL DEFAULT false"`
} }
if err := x.Sync2(new(User)); err != nil { if err := x.Sync2(new(User)); err != nil {

13
models/models.go
View file

@ -15,12 +15,14 @@ import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
// Needed for the MySQL driver "xorm.io/builder"
_ "github.com/go-sql-driver/mysql"
"xorm.io/xorm" "xorm.io/xorm"
"xorm.io/xorm/names" "xorm.io/xorm/names"
"xorm.io/xorm/schemas" "xorm.io/xorm/schemas"
// Needed for the MySQL driver
_ "github.com/go-sql-driver/mysql"
// Needed for the Postgresql driver // Needed for the Postgresql driver
_ "github.com/lib/pq" _ "github.com/lib/pq"
@ -312,6 +314,13 @@ func DumpDatabase(filePath string, dbType string) error {
tbs = append(tbs, t) tbs = append(tbs, t)
} }
// temporary fix for v1.13.x (https://github.com/go-gitea/gitea/issues/14069)
if _, err := x.Where(builder.IsNull{"keep_activity_private"}).
Cols("keep_activity_private").
Update(User{KeepActivityPrivate: false}); err != nil {
return err
}
type Version struct { type Version struct {
ID int64 `xorm:"pk autoincr"` ID int64 `xorm:"pk autoincr"`
Version int64 Version int64