Fixing error message for invalid csv field separators

xo · Mar 31, 2024 · 8ba91cf · 8ba91cf
1 parent 110a5bb
commit 8ba91cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/opts.go b/opts.go
@@ -97,10 +97,15 @@ func FromMap(opts map[string]string) (Builder, []Option) {
 			sep, quote, field = ',', '"', "csv_fieldsep"
 		}
 		if s, ok := opts[field]; ok {
-			if len(s) != 1 {
-				return newErrEncoder, []Option{withError(ErrInvalidFieldSeparator)}
+			r := []rune(s)
+			if len(r) != 1 {
+				err := ErrInvalidFieldSeparator
+				if format == "csv" {
+					err = ErrInvalidCSVFieldSeparator
+				}
+				return newErrEncoder, []Option{withError(err)}
 			}
-			sep = []rune(s)[0]
+			sep = r[0]
 		}
 		if format != "csv" && opts["fieldsep_zero"] == "on" {
 			sep = 0

diff --git a/tblfmt.go b/tblfmt.go
@@ -251,6 +251,8 @@ const (
 	ErrInvalidTemplate Error = "invalid template"
 	// ErrInvalidFieldSeparator is the invalid field separator error.
 	ErrInvalidFieldSeparator Error = "invalid field separator"
+	// ErrInvalidCSVFieldSeparator is the invalid csv field separator error.
+	ErrInvalidCSVFieldSeparator Error = "invalid csv field separator"
 	// ErrInvalidColumnParams is the invalid column params error.
 	ErrInvalidColumnParams Error = "invalid column params"
 	// ErrCrosstabResultMustHaveAtLeast3Columns is the crosstab result must