fix rebase error

This commit is contained in:
Sven Klemm
2018-08-09 10:14:14 +02:00
parent acd1acba2d
commit d2984f3b0f
3 changed files with 5 additions and 4 deletions

View File

@ -311,6 +311,7 @@ func TestPostgres(t *testing.T) {
query := &tsdb.TsdbQuery{
Queries: []*tsdb.Query{
{
DataSource: &models.DataSource{JsonData: simplejson.New()},
Model: simplejson.NewFromAny(map[string]interface{}{
"rawSql": "SELECT $__timeGroup(time, '5m', previous), avg(value) as value FROM metric GROUP BY 1 ORDER BY 1",
"format": "time_series",