From 40c8451b7d68614cc5d971cd148df503e7c00647 Mon Sep 17 00:00:00 2001 From: Richard Mahn Date: Sat, 30 Oct 2021 09:50:40 -0600 Subject: Properly determine CSV delimiter (#17459) * Fixes #16558 CSV delimiter determiner * Fixes #16558 - properly determine CSV delmiiter * Moves quoteString to a new function * Adds big test with lots of commas for tab delimited csv * Adds comments * Shortens the text of the test * Removes single quotes from regexp as only double quotes need to be searched * Fixes spelling * Fixes check of length as it probalby will only be 1e4, not greater * Makes sample size a const, properly removes truncated line * Makes sample size a const, properly removes truncated line * Fixes comment * Fixes comment * tests for FormatError() function * Adds logic to find the limiter before or after a quoted value * Simplifies regex * Error tests * Error tests * Update modules/csv/csv.go Co-authored-by: delvh * Update modules/csv/csv.go Co-authored-by: delvh * Adds comments * Update modules/csv/csv.go Co-authored-by: delvh Co-authored-by: wxiaoguang Co-authored-by: zeripath Co-authored-by: delvh --- services/gitdiff/csv_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'services/gitdiff/csv_test.go') diff --git a/services/gitdiff/csv_test.go b/services/gitdiff/csv_test.go index 1710e91c58..4101477d89 100644 --- a/services/gitdiff/csv_test.go +++ b/services/gitdiff/csv_test.go @@ -194,16 +194,16 @@ c,d,e`, var baseReader *csv.Reader if len(c.base) > 0 { - baseReader, err = csv_module.CreateReaderAndGuessDelimiter(strings.NewReader(c.base)) + baseReader, err = csv_module.CreateReaderAndDetermineDelimiter(nil, strings.NewReader(c.base)) if err != nil { - t.Errorf("CreateReaderAndGuessDelimiter failed: %s", err) + t.Errorf("CreateReaderAndDetermineDelimiter failed: %s", err) } } var headReader *csv.Reader if len(c.head) > 0 { - headReader, err = csv_module.CreateReaderAndGuessDelimiter(strings.NewReader(c.head)) + headReader, err = csv_module.CreateReaderAndDetermineDelimiter(nil, strings.NewReader(c.head)) if err != nil { - t.Errorf("CreateReaderAndGuessDelimiter failed: %s", err) + t.Errorf("CreateReaderAndDetermineDelimiter failed: %s", err) } } -- cgit v1.2.3