mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 08:02:36 +09:00 
			
		
		
		
	Fix migration v210 (#18892)
This commit is contained in:
		@@ -137,10 +137,15 @@ func remigrateU2FCredentials(x *xorm.Engine) error {
 | 
			
		||||
					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 {
 | 
			
		||||
					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 {
 | 
			
		||||
						_, err = sess.Insert(remigrated)
 | 
			
		||||
						if err != nil {
 | 
			
		||||
@@ -149,6 +154,7 @@ func remigrateU2FCredentials(x *xorm.Engine) error {
 | 
			
		||||
 | 
			
		||||
						continue
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				_, err = sess.ID(remigrated.ID).AllCols().Update(remigrated)
 | 
			
		||||
				if err != nil {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user