Fix to support UTC timezone

Related to #1019
delta-io · Dec 16, 2022 · 7667c98 · 7667c98
1 parent d1e68ca
commit 7667c98
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/rust/src/delta_arrow.rs b/rust/src/delta_arrow.rs
@@ -240,6 +240,11 @@ impl TryFrom<&ArrowDataType> for schema::SchemaDataType {
             ArrowDataType::Timestamp(TimeUnit::Microsecond, None) => {
                 Ok(schema::SchemaDataType::primitive("timestamp".to_string()))
             }
+            ArrowDataType::Timestamp(TimeUnit::Microsecond, Some(tz))
+                if tz.eq_ignore_ascii_case("utc") =>
+            {
+                Ok(schema::SchemaDataType::primitive("timestamp".to_string()))
+            }
             ArrowDataType::Struct(fields) => {
                 let converted_fields: Result<Vec<schema::SchemaField>, _> =
                     fields.iter().map(|field| field.try_into()).collect();
@@ -717,4 +722,32 @@ mod tests {
             arrow::error::ArrowError::SchemaError(_error),
         ));
     }
+
+    #[test]
+    fn test_arrow_from_delta_timestamp_type() {
+        let timestamp_field = crate::SchemaDataType::primitive("timestamp".to_string());
+        assert_eq!(
+            <ArrowDataType as TryFrom<&crate::SchemaDataType>>::try_from(&timestamp_field).unwrap(),
+            ArrowDataType::Timestamp(TimeUnit::Microsecond, None)
+        );
+    }
+
+    #[test]
+    fn test_delta_from_arrow_timestamp_type() {
+        let timestamp_field = ArrowDataType::Timestamp(TimeUnit::Microsecond, None);
+        assert_eq!(
+            <crate::SchemaDataType as TryFrom<&ArrowDataType>>::try_from(&timestamp_field).unwrap(),
+            crate::SchemaDataType::primitive("timestamp".to_string())
+        );
+    }
+
+    #[test]
+    fn test_delta_from_arrow_timestamp_type_with_tz() {
+        let timestamp_field =
+            ArrowDataType::Timestamp(TimeUnit::Microsecond, Some("UTC".to_string()));
+        assert_eq!(
+            <crate::SchemaDataType as TryFrom<&ArrowDataType>>::try_from(&timestamp_field).unwrap(),
+            crate::SchemaDataType::primitive("timestamp".to_string())
+        );
+    }
 }