Fixes #16559 - Do not trim leading spaces for tab delimited (#17442)

* Fixes #16559 - Do not trim leading spaces for tab delimited

* Adds back semicolon delimited test

* Fixes linting

* Adds nolint directive to test because uses strings starting with spaces

Co-authored-by: zeripath <art27@cantab.net>
tokarchuk/v1.17
Richard Mahn 3 years ago committed by GitHub
parent 6e2c64f27a
commit 8f9ac439ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      modules/csv/csv.go
  2. 55
      modules/csv/csv_test.go

@ -22,7 +22,11 @@ var quoteRegexp = regexp.MustCompile(`["'][\s\S]+?["']`)
func CreateReader(input io.Reader, delimiter rune) *stdcsv.Reader {
rd := stdcsv.NewReader(input)
rd.Comma = delimiter
rd.TrimLeadingSpace = true
if delimiter != '\t' && delimiter != ' ' {
// TrimLeadingSpace can't be true when delimiter is a tab or a space as the value for a column might be empty,
// thus would change `\t\t` to just `\t` or ` ` (two spaces) to just ` ` (single space)
rd.TrimLeadingSpace = true
}
return rd
}

@ -17,16 +17,57 @@ func TestCreateReader(t *testing.T) {
assert.Equal(t, ',', rd.Comma)
}
//nolint
func TestCreateReaderAndGuessDelimiter(t *testing.T) {
input := "a;b;c\n1;2;3\n4;5;6"
var csvToRowsMap = map[string][][]string{
`a;b;c
1;2;3
4;5;6`: {{"a", "b", "c"}, {"1", "2", "3"}, {"4", "5", "6"}},
`col1 col2 col3
a b c
e f
g h i
j l
m n
p q r
u
v w x
y
`: {{"col1", "col2", "col3"},
{"a", "b", "c"},
{"", "e", "f"},
{"g", "h", "i"},
{"j", "", "l"},
{"m", "n", ""},
{"p", "q", "r"},
{"", "", "u"},
{"v", "w", "x"},
{"y", "", ""},
{"", "", ""}},
` col1,col2,col3
a, b, c
d,e,f
,h, i
j, ,
, , `: {{"col1", "col2", "col3"},
{"a", "b", "c"},
{"d", "e", "f"},
{"", "h", "i"},
{"j", "", ""},
{"", "", ""}},
}
rd, err := CreateReaderAndGuessDelimiter(strings.NewReader(input))
assert.NoError(t, err)
assert.Equal(t, ';', rd.Comma)
for csv, expectedRows := range csvToRowsMap {
rd, err := CreateReaderAndGuessDelimiter(strings.NewReader(csv))
assert.NoError(t, err)
rows, err := rd.ReadAll()
assert.NoError(t, err)
assert.EqualValues(t, rows, expectedRows)
}
}
func TestGuessDelimiter(t *testing.T) {
var kases = map[string]rune{
var csvToDelimiterMap = map[string]rune{
"a": ',',
"1,2": ',',
"1;2": ';',
@ -37,7 +78,7 @@ func TestGuessDelimiter(t *testing.T) {
"<br/>": ',',
}
for k, v := range kases {
assert.EqualValues(t, guessDelimiter([]byte(k)), v)
for csv, expectedDelimiter := range csvToDelimiterMap {
assert.EqualValues(t, guessDelimiter([]byte(csv)), expectedDelimiter)
}
}

Loading…
Cancel
Save