IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

mysql: fix for TIME columns, fixes #8534

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-06-23 12:55:40 -04:00
parent 73fcc919cd
commit 60da730c95
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/tsdb/mysql/mysql.go
View File

@ -183,6 +183,7 @@ func (e MysqlExecutor) getTypedRowData(types []*sql.ColumnType, rows *core.Rows)
values := make([]interface{}, len(types)) values := make([]interface{}, len(types))
for i, stype := range types { for i, stype := range types {
e.log.Info("type", "type", stype)
switch stype.DatabaseTypeName() { switch stype.DatabaseTypeName() {
case mysql.FieldTypeNameTiny: case mysql.FieldTypeNameTiny:
values[i] = new(int8) values[i] = new(int8)
@ -209,7 +210,7 @@ func (e MysqlExecutor) getTypedRowData(types []*sql.ColumnType, rows *core.Rows)
case mysql.FieldTypeNameDateTime: case mysql.FieldTypeNameDateTime:
values[i] = new(time.Time) values[i] = new(time.Time)
case mysql.FieldTypeNameTime: case mysql.FieldTypeNameTime:
values[i] = new(time.Duration) values[i] = new(string)
case mysql.FieldTypeNameYear: case mysql.FieldTypeNameYear:
values[i] = new(int16) values[i] = new(int16)
case mysql.FieldTypeNameNULL: case mysql.FieldTypeNameNULL: