Fix transction rollback on Future drop
#1121
Open
Conversation
This file contains 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
sfackler
reviewed
Mar 21, 2024
|
Looks good to me other than the one nit! |
|
Looks like it needs a diff --git a/postgres-types/src/chrono_04.rs b/postgres-types/src/chrono_04.rs
index d599bde0..64166309 100644
--- a/postgres-types/src/chrono_04.rs
+++ b/postgres-types/src/chrono_04.rs
@@ -111,9 +111,10 @@ impl ToSql for DateTime<FixedOffset> {
impl<'a> FromSql<'a> for NaiveDate {
fn from_sql(_: &Type, raw: &[u8]) -> Result<NaiveDate, Box<dyn Error + Sync + Send>> {
let jd = types::date_from_sql(raw)?;
+ let jd = Duration::try_days(jd)?;
base()
.date()
- .checked_add_signed(Duration::days(i64::from(jd)))
+ .checked_add_signed(jd)
.ok_or_else(|| "value too large to decode".into())
} |
- fixes drop of `Future` after synchronous message send but before `Transaction` object creation - follow-on to sfackler@f6189a9 for `TransactionBuilder` and savepoint `Transaction::transaction` creation
- use non-deprecated `Duration::try_days` method - remove redundant top-level `rand` import
|
Ran |
|
Hey @sfackler, would be great to get this pushed forward so we can remove our patched dependencies. Let me know if there are other blockers, thanks. |
|
@sfackler another bump on merging this PR. Any other blockers? |
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.
PR for #1120. Also rollsback the savepoint (found while implementing this).