Merge pull request #2191 from influxdb/calls_case

Case-insensitive check for "fill"
influxdata · Apr 13, 2015 · ebd8ca7 · ebd8ca7
2 parents 4e28c3a + f5b7697
commit ebd8ca7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/influxql/parser.go b/influxql/parser.go
@@ -1558,7 +1558,7 @@ func (p *Parser) parseFill() (FillOption, interface{}, error) {
 		p.unscan()
 		return NullFill, nil, nil
 	} else {
-		if lit.Name != "fill" {
+		if strings.ToLower(lit.Name) != "fill" {
 			p.unscan()
 			return NullFill, nil, nil
 		}

diff --git a/influxql/parser_test.go b/influxql/parser_test.go
@@ -317,6 +317,20 @@ func TestParser_ParseStatement(t *testing.T) {
 			},
 		},
 
+		// SELECT statement with FILL(none) -- check case insensitivity
+		{
+			s: `SELECT mean(value) FROM cpu GROUP BY time(5m) FILL(none)`,
+			stmt: &influxql.SelectStatement{
+				Fields: []*influxql.Field{{
+					Expr: &influxql.Call{
+						Name: "mean",
+						Args: []influxql.Expr{&influxql.VarRef{Val: "value"}}}}},
+				Sources:    []influxql.Source{&influxql.Measurement{Name: "cpu"}},
+				Dimensions: []*influxql.Dimension{{Expr: &influxql.Call{Name: "time", Args: []influxql.Expr{&influxql.DurationLiteral{Val: 5 * time.Minute}}}}},
+				Fill:       influxql.NoFill,
+			},
+		},
+
 		// SELECT statement with previous fill
 		{
 			s: `SELECT mean(value) FROM cpu GROUP BY time(5m) fill(previous)`,