-
Notifications
You must be signed in to change notification settings - Fork 231
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(joins): support MySQL 8.0 (#4639)
- Loading branch information
Showing
33 changed files
with
1,320 additions
and
361 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,63 @@ | ||
| use chrono::*; | ||
| pub(crate) mod common { | ||
| use chrono::*; | ||
|
|
||
| pub(crate) fn parse_date(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| chrono::NaiveDate::parse_from_str(str, "%Y-%m-%d") | ||
| .map(|date| DateTime::<Utc>::from_utc(date.and_hms_opt(0, 0, 0).unwrap(), Utc)) | ||
| .map(DateTime::<FixedOffset>::from) | ||
| } | ||
| pub(crate) fn parse_date(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| chrono::NaiveDate::parse_from_str(str, "%Y-%m-%d") | ||
| .map(|date| DateTime::<Utc>::from_utc(date.and_hms_opt(0, 0, 0).unwrap(), Utc)) | ||
| .map(DateTime::<FixedOffset>::from) | ||
| } | ||
|
|
||
| pub(crate) fn parse_timestamptz(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| DateTime::parse_from_rfc3339(str) | ||
| } | ||
| pub(crate) fn parse_time(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| chrono::NaiveTime::parse_from_str(str, "%H:%M:%S%.f") | ||
| .map(|time| { | ||
| let base_date = chrono::NaiveDate::from_ymd_opt(1970, 1, 1).unwrap(); | ||
|
|
||
| pub(crate) fn parse_timestamp(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| NaiveDateTime::parse_from_str(str, "%Y-%m-%dT%H:%M:%S%.f") | ||
| .map(|dt| DateTime::from_utc(dt, Utc)) | ||
| .or_else(|_| DateTime::parse_from_rfc3339(str).map(DateTime::<Utc>::from)) | ||
| .map(DateTime::<FixedOffset>::from) | ||
| DateTime::<Utc>::from_utc(base_date.and_time(time), Utc) | ||
| }) | ||
| .map(DateTime::<FixedOffset>::from) | ||
| } | ||
|
|
||
| pub(crate) fn parse_timestamp(str: &str, fmt: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| NaiveDateTime::parse_from_str(str, fmt) | ||
| .map(|dt| DateTime::from_utc(dt, Utc)) | ||
| .or_else(|_| DateTime::parse_from_rfc3339(str).map(DateTime::<Utc>::from)) | ||
| .map(DateTime::<FixedOffset>::from) | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn parse_time(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| chrono::NaiveTime::parse_from_str(str, "%H:%M:%S%.f") | ||
| .map(|time| { | ||
| let base_date = chrono::NaiveDate::from_ymd_opt(1970, 1, 1).unwrap(); | ||
| pub(crate) mod postgres { | ||
| use chrono::*; | ||
|
|
||
| pub(crate) fn parse_timestamptz(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| DateTime::parse_from_rfc3339(str) | ||
| } | ||
|
|
||
| DateTime::<Utc>::from_utc(base_date.and_time(time), Utc) | ||
| }) | ||
| .map(DateTime::<FixedOffset>::from) | ||
| pub(crate) fn parse_timestamp(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| super::common::parse_timestamp(str, "%Y-%m-%dT%H:%M:%S%.f") | ||
| } | ||
|
|
||
| pub(crate) fn parse_timetz(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| // We currently don't support time with timezone. | ||
| // We strip the timezone information and parse it as a time. | ||
| // This is inline with what Quaint does already. | ||
| let time_without_tz = str.split('+').next().unwrap(); | ||
|
|
||
| super::common::parse_time(time_without_tz) | ||
| } | ||
|
|
||
| pub(crate) fn parse_bytes(str: &str) -> Result<Vec<u8>, hex::FromHexError> { | ||
| hex::decode(&str[2..]) | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn parse_timetz(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| // We currently don't support time with timezone. | ||
| // We strip the timezone information and parse it as a time. | ||
| // This is inline with what Quaint does already. | ||
| let time_without_tz = str.split('+').next().unwrap(); | ||
| pub(crate) mod mysql { | ||
| use chrono::*; | ||
|
|
||
| pub(crate) fn parse_datetime(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| super::common::parse_timestamp(str, "%Y-%m-%d %H:%M:%S%.f") | ||
| } | ||
|
|
||
| parse_time(time_without_tz) | ||
| pub(crate) fn parse_timestamp(str: &str) -> Result<DateTime<FixedOffset>, chrono::ParseError> { | ||
| parse_datetime(str) | ||
| } | ||
| } |
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
Oops, something went wrong.