enable union test

duckdb · Jun 8, 2024 · d4795dd · d4795dd
1 parent c175a8a
commit d4795dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crates/duckdb/src/test_all_types.rs b/crates/duckdb/src/test_all_types.rs
@@ -21,8 +21,7 @@ fn test_large_arrow_types() -> crate::Result<()> {
 
 fn test_with_database(database: &Connection) -> crate::Result<()> {
     // uhugeint, time_tz, and dec38_10 aren't supported in the duckdb arrow layer
-    // union is currently blocked by https://github.com/duckdb/duckdb/pull/11326
-    let excluded = ["uhugeint", "time_tz", "dec38_10", "union"];
+    let excluded = ["uhugeint", "time_tz", "dec38_10"];
 
     let mut binding = database.prepare(&format!(
         "SELECT * EXCLUDE ({}) FROM test_all_types()",

diff --git a/crates/duckdb/src/types/mod.rs b/crates/duckdb/src/types/mod.rs
@@ -205,7 +205,8 @@ impl From<&DataType> for Type {
                     .collect(),
             ),
             DataType::LargeList(inner) => Self::List(Box::new(Type::from(inner.data_type()))),
-            // DataType::Union(_, _) => Self::Union,
+            DataType::Union(_, _) => Self::Union,
+            DataType::Dictionary(_, _) => Self::Enum,
             DataType::Decimal128(..) => Self::Decimal,
             DataType::Decimal256(..) => Self::Decimal,
             DataType::Map(field, ..) => {