diff --git a/datafusion/proto/src/generated/pbjson.rs b/datafusion/proto/src/generated/pbjson.rs index 3a9067fbdbf4..956244ffdbc2 100644 --- a/datafusion/proto/src/generated/pbjson.rs +++ b/datafusion/proto/src/generated/pbjson.rs @@ -5174,9 +5174,6 @@ impl serde::Serialize for CsvWriterOptions { if !self.timestamp_format.is_empty() { len += 1; } - if !self.timestamp_tz_format.is_empty() { - len += 1; - } if !self.time_format.is_empty() { len += 1; } @@ -5199,9 +5196,6 @@ impl serde::Serialize for CsvWriterOptions { if !self.timestamp_format.is_empty() { struct_ser.serialize_field("timestampFormat", &self.timestamp_format)?; } - if !self.timestamp_tz_format.is_empty() { - struct_ser.serialize_field("timestampTzFormat", &self.timestamp_tz_format)?; - } if !self.time_format.is_empty() { struct_ser.serialize_field("timeFormat", &self.time_format)?; } @@ -5227,8 +5221,6 @@ impl<'de> serde::Deserialize<'de> for CsvWriterOptions { "datetimeFormat", "timestamp_format", "timestampFormat", - "timestamp_tz_format", - "timestampTzFormat", "time_format", "timeFormat", "null_value", @@ -5242,7 +5234,6 @@ impl<'de> serde::Deserialize<'de> for CsvWriterOptions { DateFormat, DatetimeFormat, TimestampFormat, - TimestampTzFormat, TimeFormat, NullValue, } @@ -5271,7 +5262,6 @@ impl<'de> serde::Deserialize<'de> for CsvWriterOptions { "dateFormat" | "date_format" => Ok(GeneratedField::DateFormat), "datetimeFormat" | "datetime_format" => Ok(GeneratedField::DatetimeFormat), "timestampFormat" | "timestamp_format" => Ok(GeneratedField::TimestampFormat), - "timestampTzFormat" | "timestamp_tz_format" => Ok(GeneratedField::TimestampTzFormat), "timeFormat" | "time_format" => Ok(GeneratedField::TimeFormat), "nullValue" | "null_value" => Ok(GeneratedField::NullValue), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), @@ -5298,7 +5288,6 @@ impl<'de> serde::Deserialize<'de> for CsvWriterOptions { let mut date_format__ = None; let mut datetime_format__ = None; let mut timestamp_format__ = None; - let mut timestamp_tz_format__ = None; let mut time_format__ = None; let mut null_value__ = None; while let Some(k) = map_.next_key()? { @@ -5333,12 +5322,6 @@ impl<'de> serde::Deserialize<'de> for CsvWriterOptions { } timestamp_format__ = Some(map_.next_value()?); } - GeneratedField::TimestampTzFormat => { - if timestamp_tz_format__.is_some() { - return Err(serde::de::Error::duplicate_field("timestampTzFormat")); - } - timestamp_tz_format__ = Some(map_.next_value()?); - } GeneratedField::TimeFormat => { if time_format__.is_some() { return Err(serde::de::Error::duplicate_field("timeFormat")); @@ -5359,7 +5342,6 @@ impl<'de> serde::Deserialize<'de> for CsvWriterOptions { date_format: date_format__.unwrap_or_default(), datetime_format: datetime_format__.unwrap_or_default(), timestamp_format: timestamp_format__.unwrap_or_default(), - timestamp_tz_format: timestamp_tz_format__.unwrap_or_default(), time_format: time_format__.unwrap_or_default(), null_value: null_value__.unwrap_or_default(), }) diff --git a/datafusion/proto/src/generated/prost.rs b/datafusion/proto/src/generated/prost.rs index 2bcd9c57985a..2032340e66ac 100644 --- a/datafusion/proto/src/generated/prost.rs +++ b/datafusion/proto/src/generated/prost.rs @@ -1689,8 +1689,7 @@ pub struct CsvWriterOptions { #[prost(string, tag = "5")] pub timestamp_format: ::prost::alloc::string::String, /// Optional timestamp format for timestamp with timezone arrays - #[prost(string, tag = "6")] - pub timestamp_tz_format: ::prost::alloc::string::String, + /// string timestamp_tz_format = 6; /// Optional time format for time arrays #[prost(string, tag = "7")] pub time_format: ::prost::alloc::string::String, diff --git a/datafusion/proto/src/logical_plan/mod.rs b/datafusion/proto/src/logical_plan/mod.rs index 5a4a8d61524f..3060969fa1c7 100644 --- a/datafusion/proto/src/logical_plan/mod.rs +++ b/datafusion/proto/src/logical_plan/mod.rs @@ -1664,7 +1664,7 @@ impl AsLogicalPlan for LogicalPlanNode { .timestamp_format() .unwrap_or("") .to_owned(), - timestamp_tz_format: "".to_string(), + //timestamp_tz_format: "".to_string(), time_format: csv_options .time_format() .unwrap_or("")