From aeaef15a947bce4eeedc074d4e7cdeebb1de4c95 Mon Sep 17 00:00:00 2001 From: John Shahid Date: Fri, 1 Nov 2013 16:06:01 -0400 Subject: [PATCH] select * from foo where a == 2; should return all columns not just 'a' --- src/parser/query_api.go | 2 +- src/parser/query_api_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/parser/query_api.go b/src/parser/query_api.go index af764cf3fd..05507395c5 100644 --- a/src/parser/query_api.go +++ b/src/parser/query_api.go @@ -61,7 +61,7 @@ func (self *Query) GetReferencedColumns() map[*Value][]string { name := value.Name returnedMapping[value] = uniq(append(mapping[name], notPrefixedColumns...)) if len(returnedMapping[value]) > 1 && returnedMapping[value][0] == "*" { - returnedMapping[value] = returnedMapping[value][1:] + returnedMapping[value] = returnedMapping[value][:1] } delete(mapping, name) diff --git a/src/parser/query_api_test.go b/src/parser/query_api_test.go index 796b4ac878..48949a34ca 100644 --- a/src/parser/query_api_test.go +++ b/src/parser/query_api_test.go @@ -103,15 +103,15 @@ func (self *QueryApiSuite) TestGetReferencedColumnsWithARegexTable(c *C) { } } -func (self *QueryApiSuite) TestGetReferencedColumnsReturnsGroupByColumn(c *C) { - queryStr := "select count(*), region from events group by time(1h), region;" +func (self *QueryApiSuite) TestGetReferencedColumnsWithWhereClause(c *C) { + queryStr := "select * from foo where a == 5;" query, err := ParseQuery(queryStr) c.Assert(err, IsNil) columns := query.GetReferencedColumns() c.Assert(columns, HasLen, 1) for v, columns := range columns { - c.Assert(v.Name, Equals, "events") - c.Assert(columns, DeepEquals, []string{"region"}) + c.Assert(v.Name, Equals, "foo") + c.Assert(columns, DeepEquals, []string{"*"}) } }