From 5a1cf2c7939e4a61d1df743ab3413dd46a4fe298 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 23 Jan 2018 22:28:47 +0100
Subject: [PATCH] style: minor code style changes

---
 pkg/services/sqlstore/alert.go    | 8 ++++----
 pkg/services/sqlstore/playlist.go | 9 +++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkg/services/sqlstore/alert.go b/pkg/services/sqlstore/alert.go
index a34f56066e5..cb1aec8cd65 100644
--- a/pkg/services/sqlstore/alert.go
+++ b/pkg/services/sqlstore/alert.go
@@ -24,7 +24,7 @@ func init() {
 
 func GetAlertById(query *m.GetAlertByIdQuery) error {
 	alert := m.Alert{}
-	has, err := x.Id(query.Id).Get(&alert)
+	has, err := x.ID(query.Id).Get(&alert)
 	if !has {
 		return fmt.Errorf("could not find alert")
 	}
@@ -113,7 +113,7 @@ func HandleAlertsQuery(query *m.GetAlertsQuery) error {
 	}
 
 	alerts := make([]*m.Alert, 0)
-	if err := x.Sql(sql.String(), params...).Find(&alerts); err != nil {
+	if err := x.SQL(sql.String(), params...).Find(&alerts); err != nil {
 		return err
 	}
 
@@ -260,7 +260,7 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error {
 			alert.ExecutionError = cmd.Error
 		}
 
-		sess.Id(alert.Id).Update(&alert)
+		sess.ID(alert.Id).Update(&alert)
 		return nil
 	})
 }
@@ -324,7 +324,7 @@ func GetAlertStatesForDashboard(query *m.GetAlertStatesForDashboardQuery) error
 	                WHERE org_id = ? AND dashboard_id = ?`
 
 	query.Result = make([]*m.AlertStateInfoDTO, 0)
-	err := x.Sql(rawSql, query.OrgId, query.DashboardId).Find(&query.Result)
+	err := x.SQL(rawSql, query.OrgId, query.DashboardId).Find(&query.Result)
 
 	return err
 }
diff --git a/pkg/services/sqlstore/playlist.go b/pkg/services/sqlstore/playlist.go
index 72f3079db8d..b33c1f54f92 100644
--- a/pkg/services/sqlstore/playlist.go
+++ b/pkg/services/sqlstore/playlist.go
@@ -17,15 +17,13 @@ func init() {
 }
 
 func CreatePlaylist(cmd *m.CreatePlaylistCommand) error {
-	var err error
-
 	playlist := m.Playlist{
 		Name:     cmd.Name,
 		Interval: cmd.Interval,
 		OrgId:    cmd.OrgId,
 	}
 
-	_, err = x.Insert(&playlist)
+	_, err := x.Insert(&playlist)
 
 	fmt.Printf("%v", playlist.Id)
 
@@ -47,7 +45,6 @@ func CreatePlaylist(cmd *m.CreatePlaylistCommand) error {
 }
 
 func UpdatePlaylist(cmd *m.UpdatePlaylistCommand) error {
-	var err error
 	playlist := m.Playlist{
 		Id:       cmd.Id,
 		OrgId:    cmd.OrgId,
@@ -68,7 +65,7 @@ func UpdatePlaylist(cmd *m.UpdatePlaylistCommand) error {
 		Interval: playlist.Interval,
 	}
 
-	_, err = x.Id(cmd.Id).Cols("id", "name", "interval").Update(&playlist)
+	_, err := x.ID(cmd.Id).Cols("id", "name", "interval").Update(&playlist)
 
 	if err != nil {
 		return err
@@ -104,7 +101,7 @@ func GetPlaylist(query *m.GetPlaylistByIdQuery) error {
 	}
 
 	playlist := m.Playlist{}
-	_, err := x.Id(query.Id).Get(&playlist)
+	_, err := x.ID(query.Id).Get(&playlist)
 
 	query.Result = &playlist