Skip to content

Don't add a quoted empty field to empty records if quote style is QuoteStyle::Never #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't add a quoted empty field to empty records if quote style is QuoteStyle::Never #277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0db0510
Don't add a quoted empty field to empty records if quote style is Quo…
hniksic Apr 25, 2022
557cfcd
Test the new behavior
hniksic Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 39 additions & 13 deletions csv-core/src/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ struct WriterState {
/// The number of total bytes written for the current record.
///
/// If the writer is finished or a terminator is written when this is `0`,
/// then an empty field is added as a pair of adjacent quotes.
/// and quote style is not QuoteStyle::Never, then an empty field is added
/// as a pair of adjacent quotes.
record_bytes: u64,
}

Expand All @@ -232,13 +233,15 @@ impl Writer {
let mut nout = 0;
if self.state.record_bytes == 0 && self.state.in_field {
assert!(!self.state.quoting);
let (res, o) = self.write(&[self.quote, self.quote], output);
if o == 0 {
return (res, 0);
if !matches!(self.style, QuoteStyle::Never) {
let (res, o) = self.write(&[self.quote, self.quote], output);
if o == 0 {
return (res, 0);
}
output = &mut moving(output)[o..];
nout += o;
self.state.record_bytes += o as u64;
}
output = &mut moving(output)[o..];
nout += o;
self.state.record_bytes += o as u64;
}
if !self.state.quoting {
return (WriteResult::InputEmpty, nout);
Expand Down Expand Up @@ -354,13 +357,15 @@ impl Writer {
let mut nout = 0;
if self.state.record_bytes == 0 {
assert!(!self.state.quoting);
let (res, o) = self.write(&[self.quote, self.quote], output);
if o == 0 {
return (res, 0);
if !matches!(self.style, QuoteStyle::Never) {
let (res, o) = self.write(&[self.quote, self.quote], output);
if o == 0 {
return (res, 0);
}
output = &mut moving(output)[o..];
nout += o;
self.state.record_bytes += o as u64;
}
output = &mut moving(output)[o..];
nout += o;
self.state.record_bytes += o as u64;
}
if self.state.quoting {
let (res, o) = self.write(&[self.quote], output);
Expand Down Expand Up @@ -678,6 +683,17 @@ mod tests {
assert_write!(wtr, finish, &mut out[..], 0, InputEmpty, "");
}

#[test]
fn writer_one_empty_field_terminator_quote_style_never() {
let mut wtr = Writer::new();
wtr.style = QuoteStyle::Never;
let out = &mut [0; 1024];

assert_field!(wtr, b(""), &mut out[..], 0, 0, InputEmpty, "");
assert_write!(wtr, terminator, &mut out[..], 1, InputEmpty, "\n");
assert_write!(wtr, finish, &mut out[..], 0, InputEmpty, "");
}

#[test]
fn writer_one_empty_field_finish() {
let mut wtr = Writer::new();
Expand All @@ -687,6 +703,16 @@ mod tests {
assert_write!(wtr, finish, &mut out[..], 2, InputEmpty, "\"\"");
}

#[test]
fn writer_one_empty_field_finish_quote_style_never() {
let mut wtr = Writer::new();
wtr.style = QuoteStyle::Never;
let out = &mut [0; 1024];

assert_field!(wtr, b(""), &mut out[..], 0, 0, InputEmpty, "");
assert_write!(wtr, finish, &mut out[..], 0, InputEmpty, "");
}

#[test]
fn writer_many_one_empty_field_finish() {
let mut wtr = Writer::new();
Expand Down