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

test(alerting): fixes broken unit tests

Browse Source
This commit is contained in:
bergquist
2016-06-13 09:33:14 +02:00
parent d52fc8d0ad
commit 2cf72715fb
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/services/sqlstore/alert_rule_changes.go
View File

@@ -18,24 +18,24 @@ func GetAlertRuleChanges(query *m.GetAlertChangesQuery) error {
params := make([]interface{}, 0)
sql.WriteString(`SELECT
alert_rule_change.id,
alert_rule_change.org_id,
alert_rule_change.alert_id,
alert_rule_change.type,
alert_rule_change.created
FROM alert_rule_change
alert_change.id,
alert_change.org_id,
alert_change.alert_id,
alert_change.type,
alert_change.created
FROM alert_change
`)
sql.WriteString(`WHERE alert_rule_change.org_id = ?`)
sql.WriteString(`WHERE alert_change.org_id = ?`)
params = append(params, query.OrgId)
if query.SinceId != 0 {
sql.WriteString(`AND alert_rule_change.id >= ?`)
sql.WriteString(`AND alert_change.id >= ?`)
params = append(params, query.SinceId)
}
if query.Limit != 0 {
sql.WriteString(` ORDER BY alert_rule_change.id DESC LIMIT ?`)
sql.WriteString(` ORDER BY alert_change.id DESC LIMIT ?`)
params = append(params, query.Limit)
}