Skip to content
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

Jump to bottom

fix(rust,python): ensure trailing quote is written for temporal data when CSV quote_style is non-numeric #11328

Merged
merged 4 commits into from
Sep 26, 2023
Merged

fix(rust,python): ensure trailing quote is written for temporal data when CSV quote_style is non-numeric #11328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85ed07f
fix(rust,python): ensure trailing quote is written for temporal data …
alexander-beedie Sep 26, 2023
336694f
Remove code duplication
stinodego Sep 26, 2023
cb0640f
extend test coverage with 'time' values
alexander-beedie Sep 26, 2023
cd88461
fix test lint from **temporal_formats
alexander-beedie Sep 26, 2023
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
13 changes: 7 additions & 6 deletions crates/polars-io/src/csv/write_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +186,19 @@ unsafe fn write_anyvalue(
},
_ => ndt.format(datetime_format),
};
return write!(f, "{formatted}").map_err(|_|{

let str_result = write!(f, "{formatted}");
if str_result.is_err() {
let datetime_format = unsafe { *datetime_formats.get_unchecked(i) };
let type_name = if tz.is_some() {
"DateTime"
} else {
"NaiveDateTime"
};
polars_err!(
ComputeError: "cannot format {} with format '{}'", type_name, datetime_format,
)
});
polars_bail!(
ComputeError: "cannot format {} with format '{}'", type_name, datetime_format,
)
};
str_result
},
#[cfg(feature = "dtype-time")]
AnyValue::Time(v) => {
Expand Down
56 changes: 40 additions & 16 deletions py-polars/tests/unit/io/test_csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import textwrap
import zlib
from datetime import date, datetime, time, timedelta, timezone
from typing import TYPE_CHECKING, cast
from typing import TYPE_CHECKING, TypedDict, cast

import numpy as np
import pyarrow as pa
Expand Down Expand Up @@ -1460,30 +1460,54 @@ def test_csv_9929() -> None:


def test_csv_quote_styles() -> None:
class TemporalFormats(TypedDict):
datetime_format: str
time_format: str

temporal_formats: TemporalFormats = {
"datetime_format": "%Y-%m-%dT%H:%M:%S",
"time_format": "%H:%M:%S",
}

dtm = datetime(2077, 7, 5, 3, 1, 0)
dt = dtm.date()
tm = dtm.time()

df = pl.DataFrame(
{
"float": [1.0, 2.0, None],
"string": ["a", "a,bc", '"hello'],
"int": [1, 2, 3],
"bool": [True, False, None],
"date": [dt, None, dt],
"datetime": [None, dtm, dtm],
alexander-beedie marked this conversation as resolved.
Show resolved Hide resolved
"time": [tm, tm, None],
}
)

assert (
df.write_csv(quote_style="always")
== '"float","string","int","bool"\n"1.0","a","1","true"\n"2.0","a,bc","2","false"\n"","""hello","3",""\n'
)
assert (
df.write_csv(quote_style="necessary")
== 'float,string,int,bool\n1.0,a,1,true\n2.0,"a,bc",2,false\n,"""hello",3,\n'
)
assert (
df.write_csv(quote_style="never")
== 'float,string,int,bool\n1.0,a,1,true\n2.0,a,bc,2,false\n,"hello,3,\n'
)
assert (
df.write_csv(quote_style="non_numeric", quote="8")
== '8float8,8string8,8int8,8bool8\n1.0,8a8,1,8true8\n2.0,8a,bc8,2,8false8\n,8"hello8,3,\n'
assert df.write_csv(quote_style="always", **temporal_formats) == (
'"float","string","int","bool","date","datetime","time"\n'
'"1.0","a","1","true","2077-07-05","","03:01:00"\n'
'"2.0","a,bc","2","false","","2077-07-05T03:01:00","03:01:00"\n'
'"","""hello","3","","2077-07-05","2077-07-05T03:01:00",""\n'
)
assert df.write_csv(quote_style="necessary", **temporal_formats) == (
"float,string,int,bool,date,datetime,time\n"
"1.0,a,1,true,2077-07-05,,03:01:00\n"
'2.0,"a,bc",2,false,,2077-07-05T03:01:00,03:01:00\n'
',"""hello",3,,2077-07-05,2077-07-05T03:01:00,\n'
)
assert df.write_csv(quote_style="never", **temporal_formats) == (
"float,string,int,bool,date,datetime,time\n"
"1.0,a,1,true,2077-07-05,,03:01:00\n"
"2.0,a,bc,2,false,,2077-07-05T03:01:00,03:01:00\n"
',"hello,3,,2077-07-05,2077-07-05T03:01:00,\n'
)
assert df.write_csv(quote_style="non_numeric", quote="8", **temporal_formats) == (
"8float8,8string8,8int8,8bool8,8date8,8datetime8,8time8\n"
"1.0,8a8,1,8true8,82077-07-058,,803:01:008\n"
"2.0,8a,bc8,2,8false8,,82077-07-05T03:01:008,803:01:008\n"
',8"hello8,3,,82077-07-058,82077-07-05T03:01:008,\n'
)


Expand Down