Parentheses and keeping it as part of the field

kbence · Dec 20, 2016 · 07c62ce · 07c62ce
1 parent 056eb0e
commit 07c62ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/parser/columnparser.go b/parser/columnparser.go
@@ -12,11 +12,14 @@ func isWhitespace(ch byte) bool {
 
 type separator struct {
 	start, end byte
+	keep       bool
 }
 
 var separators = []separator{
-	separator{'"', '"'},
-	separator{'[', ']'},
+	separator{'"', '"', false},
+	separator{'\'', '\'', false},
+	separator{'[', ']', true},
+	separator{'(', ')', true},
 }
 
 func isQuoteStart(char byte) bool {
@@ -71,7 +74,7 @@ func ParseColumns(output types.LogLineChannel, input types.LogLineChannel) {
 
 			if ws {
 				if !isws {
-					if !isQuoteStart(char) {
+					if !isQuoteStart(char) || separators[getQuoteType(char)].keep {
 						columnBuffer.WriteByte(char)
 					}
 					ws = false
@@ -83,7 +86,7 @@ func ParseColumns(output types.LogLineChannel, input types.LogLineChannel) {
 					columnBuffer = bytes.Buffer{}
 					ws = true
 				} else {
-					if !isQuoteEnd(char) {
+					if !isQuoteEnd(char) || separators[quoteType].keep {
 						columnBuffer.WriteByte(char)
 					}
 				}

diff --git a/parser/columnparser_test.go b/parser/columnparser_test.go
@@ -45,7 +45,7 @@ func TestSimpleColumns(t *testing.T) {
 }
 
 func TestQuotedColumns(t *testing.T) {
-	input := makeChan("first \"second column\" \"third\"")
+	input := makeChan("first \"second column\" 'third'")
 	output := make(types.LogLineChannel)
 
 	go ParseColumns(output, input)
@@ -55,14 +55,14 @@ func TestQuotedColumns(t *testing.T) {
 	if len(result.Columns) != 3 {
 		t.Error("Result must have 3 columns")
 	} else if result.Columns[2] != "second column" {
-		t.Errorf("Column[1] \"%s\" != \"second column\"", result.Columns[1])
+		t.Errorf("Column[2] \"%s\" != \"second column\"", result.Columns[2])
 	} else if result.Columns[3] != "third" {
-		t.Errorf("Column[2] \"%s\" != \"third\"", result.Columns[2])
+		t.Errorf("Column[3] \"%s\" != \"third\"", result.Columns[3])
 	}
 }
 
 func TestBracketedColumns(t *testing.T) {
-	input := makeChan("first [second column] [third]")
+	input := makeChan("first [second column] (third column)")
 	output := make(types.LogLineChannel)
 
 	go ParseColumns(output, input)
@@ -71,9 +71,9 @@ func TestBracketedColumns(t *testing.T) {
 
 	if len(result.Columns) != 3 {
 		t.Error("Result must have 3 columns")
-	} else if result.Columns[2] != "second column" {
-		t.Errorf("Column[1] \"%s\" != \"second column\"", result.Columns[1])
-	} else if result.Columns[3] != "third" {
-		t.Errorf("Column[2] \"%s\" != \"third\"", result.Columns[2])
+	} else if result.Columns[2] != "[second column]" {
+		t.Errorf("Column[2] \"%s\" != \"[second column]\"", result.Columns[2])
+	} else if result.Columns[3] != "(third column)" {
+		t.Errorf("Column[3] \"%s\" != \"third column\"", result.Columns[3])
 	}
 }