tyler.durden
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix migration v210 (#18892)

This commit is contained in:
Lunny Xiao 2022-02-25 22:04:59 +08:00 committed by GitHub
parent 49cab2b01f
commit a5e8daee73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/migrations/v210.go
View File

@ -137,10 +137,15 @@ func remigrateU2FCredentials(x *xorm.Engine) error {
CreatedUnix: reg.CreatedUnix, CreatedUnix: reg.CreatedUnix,
} }
has, err := sess.ID(reg.ID).Where("id = ?", reg.ID).Get(new(webauthnCredential)) has, err := sess.ID(reg.ID).Get(new(webauthnCredential))
if err != nil { if err != nil {
return fmt.Errorf("unable to get webauthn_credential[%d]. Error: %w", reg.ID, err) return fmt.Errorf("unable to get webauthn_credential[%d]. Error: %w", reg.ID, err)
} }
if !has {
has, err := sess.Where("`lower_name`=?", remigrated.LowerName).And("`user_id`=?", remigrated.UserID).Exist(new(webauthnCredential))
if err != nil {
return fmt.Errorf("unable to check webauthn_credential[lower_name: %s, user_id:%v]. Error: %w", remigrated.LowerName, remigrated.UserID, err)
}
if !has { if !has {
_, err = sess.Insert(remigrated) _, err = sess.Insert(remigrated)
if err != nil { if err != nil {
@ -149,6 +154,7 @@ func remigrateU2FCredentials(x *xorm.Engine) error {
continue continue
} }
}
_, err = sess.ID(remigrated.ID).AllCols().Update(remigrated) _, err = sess.ID(remigrated.ID).AllCols().Update(remigrated)
if err != nil { if err != nil {