fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(csv): less quoting in semicolon separated lists

Browse Source
This commit is contained in:
Gregor Kleen 2021-08-18 19:00:53 +02:00
parent fe8e4bbd4f
commit 42f1eabb2c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Utils/Csv.hs
View File

@ -140,7 +140,9 @@ instance ToField a => ToField (CsvSemicolonList a) where
fs = map toField xs fs = map toField xs
encOpts = defaultEncodeOptions encOpts = defaultEncodeOptions
{ encDelimiter = fromIntegral $ ord ';' { encDelimiter = fromIntegral $ ord ';'
, encQuoting = bool QuoteMinimal QuoteAll $ all null fs , encQuoting = case fs of
[fStr] | null fStr -> QuoteAll
_other -> QuoteMinimal
, encUseCrLf = True , encUseCrLf = True
} }

2
test/Utils/CsvSpec.hs
View File

@ -32,7 +32,7 @@ spec = modifyMaxSuccess (* 10) . parallel $ do
test ["foo", "bar"] "foo;bar" test ["foo", "bar"] "foo;bar"
test [] "" test [] ""
test [""] "\"\"" test [""] "\"\""
test ["", ""] "\"\";\"\"" test ["", ""] ";"
test ["foo", ""] "foo;" test ["foo", ""] "foo;"
test ["", "foo"] ";foo" test ["", "foo"] ";foo"
test ["", "", "foo", ""] ";;foo;" test ["", "", "foo", ""] ";;foo;"