Skip to content

Commit

Permalink
Fix field type conflict error
Browse files Browse the repository at this point in the history
Fixes #2908
  • Loading branch information
jwilder committed Jun 11, 2015
1 parent 9db2e82 commit ad02244
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## v0.9.1 [unreleased]

### Bugfixes

- [#2908](https://github.com/influxdb/influxdb/issues/2908): Field mismatch error messages need to be updated

## v0.9.0 [2015-06-11]

### Bugfixes
Expand Down
18 changes: 18 additions & 0 deletions influxql/ast.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,24 @@ func InspectDataType(v interface{}) DataType {
}
}

func (d DataType) String() string {
switch d {
case Float:
return "float"
case Integer:
return "integer"
case Boolean:
return "boolean"
case String:
return "string"
case Time:
return "time"
case Duration:
return "duration"
}
return "unknown"
}

// Node represents a node in the InfluxDB abstract syntax tree.
type Node interface {
node()
Expand Down

0 comments on commit ad02244

Please sign in to comment.