Fix output for named_struct when inputs are scalars

ArroyoSystems · Oct 21, 2024 · 6851c30 · 6851c30
1 parent f2792f6
commit 6851c30
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/datafusion/functions/src/core/named_struct.rs b/datafusion/functions/src/core/named_struct.rs
@@ -39,6 +39,8 @@ fn named_struct_expr(args: &[ColumnarValue]) -> Result<ColumnarValue> {
         );
     }
 
+    let all_scalar = args.iter().all(|arg| matches!(arg, ColumnarValue::Scalar(_)));
+
     let (names, values): (Vec<_>, Vec<_>) = args
         .chunks_exact(2)
         .enumerate()
@@ -70,7 +72,13 @@ fn named_struct_expr(args: &[ColumnarValue]) -> Result<ColumnarValue> {
         })
         .collect::<Vec<_>>();
 
-    Ok(ColumnarValue::Array(Arc::new(StructArray::from(fields))))
+    let struct_array = Arc::new(StructArray::from(fields));
+
+    if all_scalar {
+        Ok(ColumnarValue::Scalar(ScalarValue::Struct(struct_array)))
+    } else {
+        Ok(ColumnarValue::Array(struct_array))
+    }
 }
 
 #[derive(Debug)]