IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 09:26:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIxed syntaxis mistake unixEpochNanoFrom and unixEpochNanoTo

Browse Source
This commit is contained in:
Ander Arguiñano 2019-01-03 22:25:10 +01:00
parent ed6782402b
commit 3801a75131
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/mssql/macros.go
View File

@ -102,9 +102,9 @@ func (m *msSqlMacroEngine) evaluateMacro(name string, args []string) (string, er
} }
return fmt.Sprintf("%s >= %d AND %s <= %d", args[0], m.timeRange.GetFromAsTimeUTC().UnixNano(), args[0], m.timeRange.GetToAsTimeUTC().UnixNano()), nil return fmt.Sprintf("%s >= %d AND %s <= %d", args[0], m.timeRange.GetFromAsTimeUTC().UnixNano(), args[0], m.timeRange.GetToAsTimeUTC().UnixNano()), nil
case "__unixEpochNanoFrom": case "__unixEpochNanoFrom":
return fmt.Sprintf("'%d'", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil return fmt.Sprintf("%d", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil
case "__unixEpochNanoTo": case "__unixEpochNanoTo":
return fmt.Sprintf("'%d'", m.timeRange.GetToAsTimeUTC().UnixNano()), nil return fmt.Sprintf("%d", m.timeRange.GetToAsTimeUTC().UnixNano()), nil
case "__unixEpochGroup": case "__unixEpochGroup":
if len(args) < 2 { if len(args) < 2 {
return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name) return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)

4
pkg/tsdb/mssql/macros_test.go
View File

@ -142,14 +142,14 @@ func TestMacroEngine(t *testing.T) {
sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoFrom()") sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoFrom()")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(sql, ShouldEqual, fmt.Sprintf("select '%d'", from.UnixNano())) So(sql, ShouldEqual, fmt.Sprintf("select %d", from.UnixNano()))
}) })
Convey("interpolate __unixEpochNanoTo function", func() { Convey("interpolate __unixEpochNanoTo function", func() {
sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoTo()") sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoTo()")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(sql, ShouldEqual, fmt.Sprintf("select '%d'", to.UnixNano())) So(sql, ShouldEqual, fmt.Sprintf("select %d", to.UnixNano()))
}) })
Convey("interpolate __unixEpochGroup function", func() { Convey("interpolate __unixEpochGroup function", func() {

4
pkg/tsdb/postgres/macros.go
View File

@ -128,9 +128,9 @@ func (m *postgresMacroEngine) evaluateMacro(name string, args []string) (string,
} }
return fmt.Sprintf("%s >= %d AND %s <= %d", args[0], m.timeRange.GetFromAsTimeUTC().UnixNano(), args[0], m.timeRange.GetToAsTimeUTC().UnixNano()), nil return fmt.Sprintf("%s >= %d AND %s <= %d", args[0], m.timeRange.GetFromAsTimeUTC().UnixNano(), args[0], m.timeRange.GetToAsTimeUTC().UnixNano()), nil
case "__unixEpochNanoFrom": case "__unixEpochNanoFrom":
return fmt.Sprintf("'%d'", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil return fmt.Sprintf("%d", m.timeRange.GetFromAsTimeUTC().UnixNano()), nil
case "__unixEpochNanoTo": case "__unixEpochNanoTo":
return fmt.Sprintf("'%d'", m.timeRange.GetToAsTimeUTC().UnixNano()), nil return fmt.Sprintf("%d", m.timeRange.GetToAsTimeUTC().UnixNano()), nil
case "__unixEpochGroup": case "__unixEpochGroup":
if len(args) < 2 { if len(args) < 2 {
return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name) return "", fmt.Errorf("macro %v needs time column and interval and optional fill value", name)

4
pkg/tsdb/postgres/macros_test.go
View File

@ -125,14 +125,14 @@ func TestMacroEngine(t *testing.T) {
sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoFrom()") sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoFrom()")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(sql, ShouldEqual, fmt.Sprintf("select '%d'", from.UnixNano())) So(sql, ShouldEqual, fmt.Sprintf("select %d", from.UnixNano()))
}) })
Convey("interpolate __unixEpochNanoTo function", func() { Convey("interpolate __unixEpochNanoTo function", func() {
sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoTo()") sql, err := engine.Interpolate(query, timeRange, "select $__unixEpochNanoTo()")
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(sql, ShouldEqual, fmt.Sprintf("select '%d'", to.UnixNano())) So(sql, ShouldEqual, fmt.Sprintf("select %d", to.UnixNano()))
}) })
Convey("interpolate __unixEpochGroup function", func() { Convey("interpolate __unixEpochGroup function", func() {