BUG: Added raising when merging datetime columns with timedelta columns #56613
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merge upstream main branch
mroeschke
reviewed
Dec 27, 2023
pandas/core/reshape/merge.py
Outdated
| @@ -1526,6 +1528,11 @@ def _maybe_coerce_merge_keys(self) -> None: | |||
| ) or (lk.dtype.kind == "M" and rk.dtype.kind == "M"): | |||
| # allows datetime with different resolutions | |||
| continue | |||
| # datetime and timedelta not allowed | |||
| elif is_datetime64_dtype(lk.dtype) and is_timedelta64_dtype(rk.dtype): | |||
There was a problem hiding this comment.
Can you check the dtype.kind instead of using these methods?
There was a problem hiding this comment.
Sure! I'll check dtype.kind to keep consistent with the logic above.
mroeschke
added
Datetime
phofl
approved these changes
Dec 28, 2023
|
thx @Huanghz2001 |
meeseeksmachine
pushed a commit
to meeseeksmachine/pandas
that referenced
this pull request
Dec 28, 2023
…e columns with timedelta columns
phofl
pushed a commit
that referenced
this pull request
Dec 28, 2023
…atetime columns with timedelta columns) (#56658) Backport PR #56613: BUG: Added raising when merging datetime columns with timedelta columns Co-authored-by: Huanghz2001 <[email protected]>
cbpygit
pushed a commit
to cbpygit/pandas
that referenced
this pull request
Jan 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
doc/source/whatsnew/vX.X.X.rstfile if fixing a bug or adding a new feature.