public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck)

Browse Source 
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID
alert.go:193:15⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
alert.go:252:18⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:136:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org.go:169:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:119:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
quota.go:221:17⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
team.go:77:24⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:243:16⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:267:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:282:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:313:12⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:475:3⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:479:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
user.go:493:13⚠️ sess.Id is deprecated: use ID instead  (SA1019) (megacheck)
This commit is contained in:
Mario Trangoni
2018-09-16 12:37:08 +02:00
parent f73236f8f4
commit e85d0e8d6b
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/user.go
+7 -7
View File
@@ -240,7 +240,7 @@ func UpdateUser(cmd *m.UpdateUserCommand) error {
Updated: time.Now(),
}
if _, err := sess.Id(cmd.UserId).Update(&user); err != nil {
if _, err := sess.ID(cmd.UserId).Update(&user); err != nil {
return err
}
@@ -264,7 +264,7 @@ func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
Updated: time.Now(),
}
_, err := sess.Id(cmd.UserId).Update(&user)
_, err := sess.ID(cmd.UserId).Update(&user)
return err
})
}
@@ -279,7 +279,7 @@ func UpdateUserLastSeenAt(cmd *m.UpdateUserLastSeenAtCommand) error {
LastSeenAt: time.Now(),
}
_, err := sess.Id(cmd.UserId).Update(&user)
_, err := sess.ID(cmd.UserId).Update(&user)
return err
})
}
@@ -310,7 +310,7 @@ func setUsingOrgInTransaction(sess *DBSession, userID int64, orgID int64) error
OrgId: orgID,
}
_, err := sess.Id(userID).Update(&user)
_, err := sess.ID(userID).Update(&user)
return err
}
@@ -472,11 +472,11 @@ func DeleteUser(cmd *m.DeleteUserCommand) error {
func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
return inTransaction(func(sess *DBSession) error {
user := m.User{}
sess.Id(cmd.UserId).Get(&user)
sess.ID(cmd.UserId).Get(&user)
user.IsAdmin = cmd.IsGrafanaAdmin
sess.UseBool("is_admin")
_, err := sess.Id(user.Id).Update(&user)
_, err := sess.ID(user.Id).Update(&user)
return err
})
}
@@ -490,7 +490,7 @@ func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error {
Updated: time.Now(),
}
_, err := sess.Id(cmd.UserId).Cols("help_flags1").Update(&user)
_, err := sess.ID(cmd.UserId).Cols("help_flags1").Update(&user)
return err
})
}