opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 01:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

make timefilter macro aware of pg version

Browse Source
This commit is contained in:
Sven Klemm
2018-04-15 18:38:20 +02:00
parent 1161c7bc3e
commit 9b61ffb48a
2 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,11 +79,19 @@ func (m *PostgresMacroEngine) evaluateMacro(name string, args []string) (string,
}
return fmt.Sprintf("extract(epoch from %s) as \"time\"", args[0]), nil
case "__timeFilter":
// dont use to_timestamp in this macro for redshift compatibility #9566
if len(args) == 0 {
return "", fmt.Errorf("missing time column argument for macro %v", name)
}
return fmt.Sprintf("extract(epoch from %s) BETWEEN %d AND %d", args[0], m.TimeRange.GetFromAsSecondsEpoch(), m.TimeRange.GetToAsSecondsEpoch()), nil
pg_version := m.Query.DataSource.JsonData.Get("postgresVersion").MustInt(0)
if pg_version >= 80100 {
// postgres has to_timestamp(double) starting with 8.1
return fmt.Sprintf("%s BETWEEN to_timestamp(%d) AND to_timestamp(%d)", args[0], m.TimeRange.GetFromAsSecondsEpoch(), m.TimeRange.GetToAsSecondsEpoch()), nil
}
// dont use to_timestamp in this macro for redshift compatibility #9566
return fmt.Sprintf("%s BETWEEN 'epoch'::timestamptz + %d * '1s'::interval AND 'epoch'::timestamptz + %d * '1s'::interval", args[0], m.TimeRange.GetFromAsSecondsEpoch(), m.TimeRange.GetToAsSecondsEpoch()), nil
case "__timeFrom":
return fmt.Sprintf("to_timestamp(%d)", m.TimeRange.GetFromAsSecondsEpoch()), nil
case "__timeTo":