Skip to content

fix: respect MySQL timestamp format #1510

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

Merged
sunng87 merged 2 commits into from
May 4, 2023
Merged

fix: respect MySQL timestamp format #1510

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
be2c6d0
fix: respect MySQL timestamp format
v0y4g3r May 4, 2023
676df85
fix: clippy
v0y4g3r May 4, 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
33 changes: 29 additions & 4 deletions src/common/time/src/timestamp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,17 @@ impl Timestamp {
/// Format timestamp to ISO8601 string. If the timestamp exceeds what chrono timestamp can
/// represent, this function simply print the timestamp unit and value in plain string.
pub fn to_iso8601_string(&self) -> String {
self.as_formatted_string("%Y-%m-%d %H:%M:%S%.f%z")
}

pub fn to_local_string(&self) -> String {
self.as_formatted_string("%Y-%m-%d %H:%M:%S%.f")
}

fn as_formatted_string(self, pattern: &str) -> String {
if let Some(v) = self.to_chrono_datetime() {
let local = Local {};
format!(
"{}",
local.from_utc_datetime(&v).format("%Y-%m-%d %H:%M:%S%.f%z")
)
format!("{}", local.from_utc_datetime(&v).format(pattern))
} else {
format!("[Timestamp{}: {}]", self.unit, self.value)
}
Expand Down Expand Up @@ -889,4 +894,24 @@ mod tests {
Timestamp::from_str("1970-01-01 08:00:00").unwrap()
);
}

#[test]
fn test_to_local_string() {
std::env::set_var("TZ", "Asia/Shanghai");

assert_eq!(
"1970-01-01 08:00:00.000000001",
Timestamp::new(1, TimeUnit::Nanosecond).to_local_string()
);

assert_eq!(
"1970-01-01 08:00:00.001",
Timestamp::new(1, TimeUnit::Millisecond).to_local_string()
);

assert_eq!(
"1970-01-01 08:00:01",
Timestamp::new(1, TimeUnit::Second).to_local_string()
);
}
}
2 changes: 1 addition & 1 deletion src/servers/src/mysql/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ impl<'a, W: AsyncWrite + Unpin> MysqlResultWriter<'a, W> {
Value::Binary(v) => row_writer.write_col(v.deref())?,
Value::Date(v) => row_writer.write_col(v.val())?,
Value::DateTime(v) => row_writer.write_col(v.val())?,
Value::Timestamp(v) => row_writer.write_col(v.to_iso8601_string())?,
Value::Timestamp(v) => row_writer.write_col(v.to_local_string())?,
Value::List(_) => {
return Err(Error::Internal {
err_msg: format!(
Expand Down