From e5a5bef20002a46dc0e178d12a278fcca867e197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 31 Mar 2017 12:49:05 +0200 Subject: [PATCH] mysql: minor update --- pkg/services/sqlstore/sql_test_data.go | 4 ++-- pkg/tsdb/mysql/mysql.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/services/sqlstore/sql_test_data.go b/pkg/services/sqlstore/sql_test_data.go index f6c57428d20..30399c4bdfc 100644 --- a/pkg/services/sqlstore/sql_test_data.go +++ b/pkg/services/sqlstore/sql_test_data.go @@ -14,8 +14,8 @@ func init() { func sqlRandomWalk(m1 string, m2 string, intWalker int64, floatWalker float64, sess *session) error { - timeWalker := time.Now().Add(time.Hour * -1) - now := time.Now() + timeWalker := time.Now().UTC().Add(time.Hour * -1) + now := time.Now().UTC() step := time.Minute row := &m.SqlTestData{ diff --git a/pkg/tsdb/mysql/mysql.go b/pkg/tsdb/mysql/mysql.go index ff85d8b1810..3a5aad7c51f 100644 --- a/pkg/tsdb/mysql/mysql.go +++ b/pkg/tsdb/mysql/mysql.go @@ -61,7 +61,7 @@ func (e *MysqlExecutor) initEngine() error { } } - cnnstr := fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4", e.datasource.User, e.datasource.Password, "tcp", e.datasource.Url, e.datasource.Database) + cnnstr := fmt.Sprintf("%s:%s@%s(%s)/%s?charset=utf8mb4&parseTime=true&loc=UTC", e.datasource.User, e.datasource.Password, "tcp", e.datasource.Url, e.datasource.Database) e.log.Debug("getEngine", "connection", cnnstr) engine, err := xorm.NewEngine("mysql", cnnstr)