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

Don't pass datasource to newPostgresMacroEngine

Browse Source
This commit is contained in:
Sven Klemm
2018-08-14 09:15:24 +02:00
parent 3552a4cb86
commit 3955133f7e
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import (
"strings"
"time"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/tsdb"
)
@ -21,10 +20,8 @@ type postgresMacroEngine struct {
timescaledb bool
}
func newPostgresMacroEngine(datasource *models.DataSource) tsdb.SqlMacroEngine {
engine := &postgresMacroEngine{}
engine.timescaledb = datasource.JsonData.Get("timescaledb").MustBool(false)
return engine
func newPostgresMacroEngine(timescaledb bool) tsdb.SqlMacroEngine {
return &postgresMacroEngine{timescaledb: timescaledb}
}
func (m *postgresMacroEngine) Interpolate(query *tsdb.Query, timeRange *tsdb.TimeRange, sql string) (string, error) {