FromClause.GetString() shouldn't assume 2 series in the merge

Fix influxdata#1047
tchen0123 · Oct 22, 2014 · d3b6c1b · d3b6c1b
1 parent baabefd
commit d3b6c1b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/integration/data_test.go b/integration/data_test.go
@@ -267,6 +267,28 @@ func (self *DataTestSuite) TestModeWithNils(c *C) {
 	c.Assert(maps[0]["m2"], Equals, nil)
 }
 
+func (self *DataTestSuite) TestMergeRegexOneSeries(c *C) {
+	data := `
+[
+  {
+    "name": "test_merge_1",
+    "columns": ["time", "value"],
+    "points": [
+      [1401321700000, "m11"],
+      [1401321600000, "m12"]
+    ]
+  }
+]`
+
+	self.client.WriteJsonData(data, c, influxdb.Millisecond)
+	serieses := self.client.RunQuery("select * from merge(/.*/)", c, "m")
+	c.Assert(serieses, HasLen, 1)
+	maps := ToMap(serieses[0])
+	c.Assert(maps, HasLen, 2)
+	c.Assert(maps[0]["value"], Equals, "m11")
+	c.Assert(maps[1]["value"], Equals, "m12")
+}
+
 func (self *DataTestSuite) TestMergeRegex(c *C) {
 	data := `
 [

diff --git a/parser/from_clause.go b/parser/from_clause.go
@@ -48,8 +48,14 @@ func (self *FromClause) GetString() string {
 	buffer := bytes.NewBufferString("")
 	switch self.Type {
 	case FromClauseMerge:
-		fmt.Fprintf(buffer, "%s%s merge %s %s", self.Names[0].Name.GetString(), self.Names[1].GetAliasString(),
-			self.Names[1].Name.GetString(), self.Names[1].GetAliasString())
+		fmt.Fprintf(buffer, "merge(")
+		for i, n := range self.Names {
+			if i > 0 {
+				buffer.WriteRune('|')
+			}
+			buffer.WriteString(n.Name.GetString())
+		}
+		buffer.WriteRune(')')
 	case FromClauseInnerJoin:
 		fmt.Fprintf(buffer, "%s%s inner join %s%s", self.Names[0].Name.GetString(), self.Names[0].GetAliasString(),
 			self.Names[1].Name.GetString(), self.Names[1].GetAliasString())