Skip to content

fix(unparser): use to_rfc3339 for default TIMESTAMPTZ formatting #21295

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
alamb merged 1 commit into from
Apr 3, 2026
+17 −41
Merged

fix(unparser): use to_rfc3339 for default TIMESTAMPTZ formatting #21295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 1 addition & 24 deletions datafusion/sql/src/unparser/dialect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ pub trait Dialect: Send + Sync {

/// Allows the dialect to override logic of formatting datetime with tz into string.
fn timestamp_with_tz_to_string(&self, dt: DateTime<Tz>, _unit: TimeUnit) -> String {
dt.to_string()
dt.to_rfc3339()
}

/// Whether the dialect supports an empty select list such as `SELECT FROM table`.
Expand Down Expand Up @@ -468,17 +468,6 @@ impl Dialect for DuckDBDialect {

Ok(None)
}

fn timestamp_with_tz_to_string(&self, dt: DateTime<Tz>, unit: TimeUnit) -> String {
let format = match unit {
TimeUnit::Second => "%Y-%m-%d %H:%M:%S%:z",
TimeUnit::Millisecond => "%Y-%m-%d %H:%M:%S%.3f%:z",
TimeUnit::Microsecond => "%Y-%m-%d %H:%M:%S%.6f%:z",
TimeUnit::Nanosecond => "%Y-%m-%d %H:%M:%S%.9f%:z",
};

dt.format(format).to_string()
}
}

pub struct MySqlDialect {}
Expand Down Expand Up @@ -635,18 +624,6 @@ impl Dialect for BigQueryDialect {
fn unnest_as_table_factor(&self) -> bool {
true
}

fn timestamp_with_tz_to_string(&self, dt: DateTime<Tz>, unit: TimeUnit) -> String {
// https://docs.cloud.google.com/bigquery/docs/reference/standard-sql/data-types#timestamp_type
let format = match unit {
TimeUnit::Second => "%Y-%m-%d %H:%M:%S%:z",
TimeUnit::Millisecond => "%Y-%m-%d %H:%M:%S%.3f%:z",
TimeUnit::Microsecond => "%Y-%m-%d %H:%M:%S%.6f%:z",
TimeUnit::Nanosecond => "%Y-%m-%d %H:%M:%S%.9f%:z",
};

dt.format(format).to_string()
}
}

impl BigQueryDialect {
Expand Down
33 changes: 16 additions & 17 deletions datafusion/sql/src/unparser/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,7 +2047,7 @@ mod tests {
ScalarValue::TimestampSecond(Some(10001), Some("+08:00".into())),
None,
),
r#"CAST('1970-01-01 10:46:41 +08:00' AS TIMESTAMP)"#,
r#"CAST('1970-01-01T10:46:41+08:00' AS TIMESTAMP)"#,
),
(
Expr::Literal(ScalarValue::TimestampMillisecond(Some(10001), None), None),
Expand All @@ -2058,7 +2058,7 @@ mod tests {
ScalarValue::TimestampMillisecond(Some(10001), Some("+08:00".into())),
None,
),
r#"CAST('1970-01-01 08:00:10.001 +08:00' AS TIMESTAMP)"#,
r#"CAST('1970-01-01T08:00:10.001+08:00' AS TIMESTAMP)"#,
),
(
Expr::Literal(ScalarValue::TimestampMicrosecond(Some(10001), None), None),
Expand All @@ -2069,7 +2069,7 @@ mod tests {
ScalarValue::TimestampMicrosecond(Some(10001), Some("+08:00".into())),
None,
),
r#"CAST('1970-01-01 08:00:00.010001 +08:00' AS TIMESTAMP)"#,
r#"CAST('1970-01-01T08:00:00.010001+08:00' AS TIMESTAMP)"#,
),
(
Expr::Literal(ScalarValue::TimestampNanosecond(Some(10001), None), None),
Expand All @@ -2080,7 +2080,7 @@ mod tests {
ScalarValue::TimestampNanosecond(Some(10001), Some("+08:00".into())),
None,
),
r#"CAST('1970-01-01 08:00:00.000010001 +08:00' AS TIMESTAMP)"#,
r#"CAST('1970-01-01T08:00:00.000010001+08:00' AS TIMESTAMP)"#,
),
(
Expr::Literal(ScalarValue::Time32Second(Some(10001)), None),
Expand Down Expand Up @@ -3356,90 +3356,89 @@ mod tests {
(
Arc::clone(&default_dialect),
ScalarValue::TimestampSecond(Some(1757934000), Some("+00:00".into())),
"CAST('2025-09-15 11:00:00 +00:00' AS TIMESTAMP)",
"CAST('2025-09-15T11:00:00+00:00' AS TIMESTAMP)",
),
(
Arc::clone(&default_dialect),
ScalarValue::TimestampMillisecond(
Some(1757934000123),
Some("+01:00".into()),
),
"CAST('2025-09-15 12:00:00.123 +01:00' AS TIMESTAMP)",
"CAST('2025-09-15T12:00:00.123+01:00' AS TIMESTAMP)",
),
(
Arc::clone(&default_dialect),
ScalarValue::TimestampMicrosecond(
Some(1757934000123456),
Some("-01:00".into()),
),
"CAST('2025-09-15 10:00:00.123456 -01:00' AS TIMESTAMP)",
"CAST('2025-09-15T10:00:00.123456-01:00' AS TIMESTAMP)",
),
(
Arc::clone(&default_dialect),
ScalarValue::TimestampNanosecond(
Some(1757934000123456789),
Some("+00:00".into()),
),
"CAST('2025-09-15 11:00:00.123456789 +00:00' AS TIMESTAMP)",
"CAST('2025-09-15T11:00:00.123456789+00:00' AS TIMESTAMP)",
),
(
Arc::clone(&duckdb_dialect),
ScalarValue::TimestampSecond(Some(1757934000), Some("+00:00".into())),
"CAST('2025-09-15 11:00:00+00:00' AS TIMESTAMP)",
"CAST('2025-09-15T11:00:00+00:00' AS TIMESTAMP)",
),
(
Arc::clone(&duckdb_dialect),
ScalarValue::TimestampMillisecond(
Some(1757934000123),
Some("+01:00".into()),
),
"CAST('2025-09-15 12:00:00.123+01:00' AS TIMESTAMP)",
"CAST('2025-09-15T12:00:00.123+01:00' AS TIMESTAMP)",
),
(
Arc::clone(&duckdb_dialect),
ScalarValue::TimestampMicrosecond(
Some(1757934000123456),
Some("-01:00".into()),
),
"CAST('2025-09-15 10:00:00.123456-01:00' AS TIMESTAMP)",
"CAST('2025-09-15T10:00:00.123456-01:00' AS TIMESTAMP)",
),
(
Arc::clone(&duckdb_dialect),
ScalarValue::TimestampNanosecond(
Some(1757934000123456789),
Some("+00:00".into()),
),
"CAST('2025-09-15 11:00:00.123456789+00:00' AS TIMESTAMP)",
"CAST('2025-09-15T11:00:00.123456789+00:00' AS TIMESTAMP)",
),
// BigQuery: should be no space between timestamp and timezone
(
Arc::clone(&bigquery_dialect),
ScalarValue::TimestampSecond(Some(1757934000), Some("+00:00".into())),
"CAST('2025-09-15 11:00:00+00:00' AS TIMESTAMP)",
"CAST('2025-09-15T11:00:00+00:00' AS TIMESTAMP)",
),
(
Arc::clone(&bigquery_dialect),
ScalarValue::TimestampMillisecond(
Some(1757934000123),
Some("+01:00".into()),
),
"CAST('2025-09-15 12:00:00.123+01:00' AS TIMESTAMP)",
"CAST('2025-09-15T12:00:00.123+01:00' AS TIMESTAMP)",
),
(
Arc::clone(&bigquery_dialect),
ScalarValue::TimestampMicrosecond(
Some(1757934000123456),
Some("-01:00".into()),
),
"CAST('2025-09-15 10:00:00.123456-01:00' AS TIMESTAMP)",
"CAST('2025-09-15T10:00:00.123456-01:00' AS TIMESTAMP)",
),
(
Arc::clone(&bigquery_dialect),
ScalarValue::TimestampNanosecond(
Some(1757934000123456789),
Some("+00:00".into()),
),
"CAST('2025-09-15 11:00:00.123456789+00:00' AS TIMESTAMP)",
"CAST('2025-09-15T11:00:00.123456789+00:00' AS TIMESTAMP)",
),
] {
let unparser = Unparser::new(dialect.as_ref());
Expand Down
Loading