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

refactor(dtype): automatically cast mixed string and date columns to strings #245

Merged
merged 2 commits into from
Jul 1, 2024
Merged

refactor(dtype): automatically cast mixed string and date columns to strings #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c4680d
refactor(dtype): automatically cast mixed string and date columns to …
lukapeschke Jul 1, 2024
349035e
Merge branch 'main' into support-mixed-strings-and-dates
lukapeschke Jul 1, 2024
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
Binary file modified python/tests/fixtures/fixture-multi-dtypes-columns.xlsx
View file
Open in desktop
Binary file not shown.
21 changes: 19 additions & 2 deletions python/tests/test_dtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def expected_data() -> dict[str, list[Any]]:
"Date": [datetime(2023, 7, 21)] * 9,
"Details": ["Healthcare"] * 7 + ["Something"] * 2,
"Asset ID": ["84444"] * 7 + ["ABC123"] * 2,
"Mixed dates": ["2023-07-21 00:00:00"] * 6 + ["July 23rd"] * 3,
}


Expand Down Expand Up @@ -89,13 +90,29 @@ def test_sheet_with_mixed_dtypes_and_sample_rows(expected_data: dict[str, list[A
None,
]
expected_data["Asset ID"] = [84444.0] * 7 + [None] * 2
expected_data["Mixed dates"] = [datetime(2023, 7, 21)] * 6 + [None] * 3

pd_df = sheet.to_pandas()
pd_assert_frame_equal(pd_df, pd.DataFrame(expected_data).astype({"Date": "datetime64[ms]"}))
pd_assert_frame_equal(
pd_df,
pd.DataFrame(expected_data).astype(
{
"Date": "datetime64[ms]",
"Mixed dates": "datetime64[ms]",
}
),
)

pl_df = sheet.to_polars()
pl_assert_frame_equal(
pl_df, pl.DataFrame(expected_data, schema_overrides={"Date": pl.Datetime(time_unit="ms")})
pl_df,
pl.DataFrame(
expected_data,
schema_overrides={
"Date": pl.Datetime(time_unit="ms"),
"Mixed dates": pl.Datetime(time_unit="ms"),
},
),
)


Expand Down
10 changes: 9 additions & 1 deletion src/types/dtype.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,15 @@ fn int_types() -> &'static HashSet<DType> {
}

fn string_types() -> &'static HashSet<DType> {
STRING_TYPES_CELL.get_or_init(|| HashSet::from([DType::Int, DType::Float, DType::String]))
STRING_TYPES_CELL.get_or_init(|| {
HashSet::from([
DType::Int,
DType::Float,
DType::String,
DType::DateTime,
DType::Date,
])
})
}

pub(crate) fn get_dtype_for_column<DT: CellType + Debug + DataType>(
Expand Down
Loading