IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/sqlstore/alert.go
View File

@ -190,7 +190,7 @@ func updateAlerts(existingAlerts []*m.Alert, cmd *m.SaveAlertsCommand, sess *DBS
alert.Updated = timeNow() alert.Updated = timeNow()
alert.State = alertToUpdate.State alert.State = alertToUpdate.State
sess.MustCols("message") sess.MustCols("message")
_, err := sess.Id(alert.Id).Update(alert) _, err := sess.ID(alert.Id).Update(alert)
if err != nil { if err != nil {
return err return err
} }
@ -249,7 +249,7 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
alert := m.Alert{} alert := m.Alert{}
if has, err := sess.Id(cmd.AlertId).Get(&alert); err != nil { if has, err := sess.ID(cmd.AlertId).Get(&alert); err != nil {
return err return err
} else if !has { } else if !has {
return fmt.Errorf("Could not find alert") return fmt.Errorf("Could not find alert")

2
pkg/services/sqlstore/annotation.go
View File

@ -110,7 +110,7 @@ func (r *SqlAnnotationRepo) Update(item *annotations.Item) error {
existing.Tags = item.Tags existing.Tags = item.Tags
_, err = sess.Table("annotation").Id(existing.Id).Cols("epoch", "text", "region_id", "updated", "tags").Update(existing) _, err = sess.Table("annotation").ID(existing.Id).Cols("epoch", "text", "region_id", "updated", "tags").Update(existing)
return err return err
}) })
} }

4
pkg/services/sqlstore/org.go
View File

@ -133,7 +133,7 @@ func UpdateOrg(cmd *m.UpdateOrgCommand) error {
Updated: time.Now(), Updated: time.Now(),
} }
affectedRows, err := sess.Id(cmd.OrgId).Update(&org) affectedRows, err := sess.ID(cmd.OrgId).Update(&org)
if err != nil { if err != nil {
return err return err
@ -166,7 +166,7 @@ func UpdateOrgAddress(cmd *m.UpdateOrgAddressCommand) error {
Updated: time.Now(), Updated: time.Now(),
} }
if _, err := sess.Id(cmd.OrgId).Update(&org); err != nil { if _, err := sess.ID(cmd.OrgId).Update(&org); err != nil {
return err return err
} }

6
pkg/services/sqlstore/org_users.go
View File

@ -21,7 +21,7 @@ func AddOrgUser(cmd *m.AddOrgUserCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
// check if user exists // check if user exists
var user m.User var user m.User
if exists, err := sess.Id(cmd.UserId).Get(&user); err != nil { if exists, err := sess.ID(cmd.UserId).Get(&user); err != nil {
return err return err
} else if !exists { } else if !exists {
return m.ErrUserNotFound return m.ErrUserNotFound
@ -85,7 +85,7 @@ func UpdateOrgUser(cmd *m.UpdateOrgUserCommand) error {
orgUser.Role = cmd.Role orgUser.Role = cmd.Role
orgUser.Updated = time.Now() orgUser.Updated = time.Now()
_, err = sess.Id(orgUser.Id).Update(&orgUser) _, err = sess.ID(orgUser.Id).Update(&orgUser)
if err != nil { if err != nil {
return err return err
} }
@ -138,7 +138,7 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
// check if user exists // check if user exists
var user m.User var user m.User
if exists, err := sess.Id(cmd.UserId).Get(&user); err != nil { if exists, err := sess.ID(cmd.UserId).Get(&user); err != nil {
return err return err
} else if !exists { } else if !exists {
return m.ErrUserNotFound return m.ErrUserNotFound

2
pkg/services/sqlstore/plugin_setting.go
View File

@ -100,7 +100,7 @@ func UpdatePluginSetting(cmd *m.UpdatePluginSettingCmd) error {
pluginSetting.Pinned = cmd.Pinned pluginSetting.Pinned = cmd.Pinned
pluginSetting.PluginVersion = cmd.PluginVersion pluginSetting.PluginVersion = cmd.PluginVersion
_, err = sess.Id(pluginSetting.Id).Update(&pluginSetting) _, err = sess.ID(pluginSetting.Id).Update(&pluginSetting)
return err return err
}) })
} }

2
pkg/services/sqlstore/preferences.go
View File

@ -94,7 +94,7 @@ func SavePreferences(cmd *m.SavePreferencesCommand) error {
prefs.Theme = cmd.Theme prefs.Theme = cmd.Theme
prefs.Updated = time.Now() prefs.Updated = time.Now()
prefs.Version += 1 prefs.Version += 1
_, err = sess.Id(prefs.Id).AllCols().Update(&prefs) _, err = sess.ID(prefs.Id).AllCols().Update(&prefs)
return err return err
}) })
} }

4
pkg/services/sqlstore/quota.go
View File

@ -116,7 +116,7 @@ func UpdateOrgQuota(cmd *m.UpdateOrgQuotaCmd) error {
} }
} else { } else {
//update existing quota entry in the DB. //update existing quota entry in the DB.
if _, err := sess.Id(quota.Id).Update(&quota); err != nil { if _, err := sess.ID(quota.Id).Update(&quota); err != nil {
return err return err
} }
} }
@ -218,7 +218,7 @@ func UpdateUserQuota(cmd *m.UpdateUserQuotaCmd) error {
} }
} else { } else {
//update existing quota entry in the DB. //update existing quota entry in the DB.
if _, err := sess.Id(quota.Id).Update(&quota); err != nil { if _, err := sess.ID(quota.Id).Update(&quota); err != nil {
return err return err
} }
} }

2
pkg/services/sqlstore/team.go
View File

@ -74,7 +74,7 @@ func UpdateTeam(cmd *m.UpdateTeamCommand) error {
sess.MustCols("email") sess.MustCols("email")
affectedRows, err := sess.Id(cmd.Id).Update(&team) affectedRows, err := sess.ID(cmd.Id).Update(&team)
if err != nil { if err != nil {
return err return err

14
pkg/services/sqlstore/user.go
View File

@ -240,7 +240,7 @@ func UpdateUser(cmd *m.UpdateUserCommand) error {
Updated: time.Now(), 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 return err
} }
@ -264,7 +264,7 @@ func ChangeUserPassword(cmd *m.ChangeUserPasswordCommand) error {
Updated: time.Now(), Updated: time.Now(),
} }
_, err := sess.Id(cmd.UserId).Update(&user) _, err := sess.ID(cmd.UserId).Update(&user)
return err return err
}) })
} }
@ -279,7 +279,7 @@ func UpdateUserLastSeenAt(cmd *m.UpdateUserLastSeenAtCommand) error {
LastSeenAt: time.Now(), LastSeenAt: time.Now(),
} }
_, err := sess.Id(cmd.UserId).Update(&user) _, err := sess.ID(cmd.UserId).Update(&user)
return err return err
}) })
} }
@ -310,7 +310,7 @@ func setUsingOrgInTransaction(sess *DBSession, userID int64, orgID int64) error
OrgId: orgID, OrgId: orgID,
} }
_, err := sess.Id(userID).Update(&user) _, err := sess.ID(userID).Update(&user)
return err return err
} }
@ -472,11 +472,11 @@ func DeleteUser(cmd *m.DeleteUserCommand) error {
func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error { func UpdateUserPermissions(cmd *m.UpdateUserPermissionsCommand) error {
return inTransaction(func(sess *DBSession) error { return inTransaction(func(sess *DBSession) error {
user := m.User{} user := m.User{}
sess.Id(cmd.UserId).Get(&user) sess.ID(cmd.UserId).Get(&user)
user.IsAdmin = cmd.IsGrafanaAdmin user.IsAdmin = cmd.IsGrafanaAdmin
sess.UseBool("is_admin") sess.UseBool("is_admin")
_, err := sess.Id(user.Id).Update(&user) _, err := sess.ID(user.Id).Update(&user)
return err return err
}) })
} }
@ -490,7 +490,7 @@ func SetUserHelpFlag(cmd *m.SetUserHelpFlagCommand) error {
Updated: time.Now(), 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 return err
}) })
} }