@@ -1292,9 +1292,7 @@ fn case_result_field_metadata(
12921292 fields. push ( BranchField {
12931293 data_type : cast. cast_type ( ) . clone ( ) ,
12941294 metadata : metadata. clone ( ) ,
1295- certainly_null : unwrap_certainly_null_expr ( expr)
1296- . downcast_ref :: < Literal > ( )
1297- . is_some_and ( |literal| literal. value ( ) . is_null ( ) ) ,
1295+ certainly_null : false ,
12981296 } ) ;
12991297 } else {
13001298 work. push ( Work :: FinishCast ( cast. cast_type ( ) ) ) ;
@@ -1305,11 +1303,7 @@ fn case_result_field_metadata(
13051303 fields. push ( BranchField {
13061304 data_type : cast. cast_type ( ) . clone ( ) ,
13071305 metadata : metadata. clone ( ) ,
1308- certainly_null : unwrap_certainly_null_expr (
1309- cast. expr ( ) . as_ref ( ) ,
1310- )
1311- . downcast_ref :: < Literal > ( )
1312- . is_some_and ( |literal| literal. value ( ) . is_null ( ) ) ,
1306+ certainly_null : false ,
13131307 } ) ;
13141308 } else {
13151309 work. push ( Work :: FinishCast ( cast. cast_type ( ) ) ) ;
@@ -1318,7 +1312,12 @@ fn case_result_field_metadata(
13181312 } else if let Some ( negative) = expr. downcast_ref :: < NegativeExpr > ( ) {
13191313 work. push ( Work :: Visit ( negative. arg ( ) . as_ref ( ) ) ) ;
13201314 } else if let Some ( not) = expr. downcast_ref :: < NotExpr > ( ) {
1321- work. push ( Work :: Visit ( not. arg ( ) . as_ref ( ) ) ) ;
1315+ let field = not. return_field ( input_schema) ?;
1316+ fields. push ( BranchField {
1317+ data_type : field. data_type ( ) . clone ( ) ,
1318+ metadata : Metadata :: new ( ) ,
1319+ certainly_null : false ,
1320+ } ) ;
13221321 } else {
13231322 let field = expr. return_field ( input_schema) ?;
13241323 fields. push ( BranchField {
@@ -1912,6 +1911,60 @@ mod tests {
19121911 Ok ( ( ) )
19131912 }
19141913
1914+ #[ test]
1915+ fn case_not_does_not_inherit_input_metadata ( ) -> Result < ( ) > {
1916+ let metadata = HashMap :: from ( [ ( "logical" . to_string ( ) , "boolean" . to_string ( ) ) ] ) ;
1917+ let schema = Schema :: new ( vec ! [
1918+ Field :: new( "a" , DataType :: Boolean , false ) . with_metadata( metadata. clone( ) ) ,
1919+ Field :: new( "b" , DataType :: Boolean , false ) . with_metadata( metadata) ,
1920+ ] ) ;
1921+ let negated: Arc < dyn PhysicalExpr > = Arc :: new ( NotExpr :: new ( col ( "a" , & schema) ?) ) ;
1922+ let expr = case ( None , vec ! [ ( lit( true ) , negated) ] , Some ( col ( "b" , & schema) ?) ) ?;
1923+ assert ! ( expr. return_field( & schema) ?. metadata( ) . is_empty( ) ) ;
1924+ Ok ( ( ) )
1925+ }
1926+
1927+ #[ test]
1928+ fn case_explicitly_marked_null_cast_matches_logical_field ( ) -> Result < ( ) > {
1929+ let metadata = HashMap :: from ( [ (
1930+ EXTENSION_TYPE_NAME_KEY . to_string ( ) ,
1931+ "geoarrow.wkb" . to_string ( ) ,
1932+ ) ] ) ;
1933+ let schema = Schema :: new ( vec ! [
1934+ Field :: new( "a" , DataType :: LargeBinary , false ) . with_metadata( metadata. clone( ) ) ,
1935+ ] ) ;
1936+ let target_field: FieldRef = Arc :: new (
1937+ Field :: new ( "marked_null" , DataType :: Binary , true ) . with_metadata ( metadata) ,
1938+ ) ;
1939+ let marked_nulls: [ Arc < dyn PhysicalExpr > ; 2 ] = [
1940+ Arc :: new ( CastExpr :: new_with_target_field (
1941+ lit ( ScalarValue :: Null ) ,
1942+ Arc :: clone ( & target_field) ,
1943+ None ,
1944+ ) ) ,
1945+ Arc :: new ( TryCastExpr :: new_with_target_field (
1946+ lit ( ScalarValue :: Null ) ,
1947+ target_field,
1948+ ) ) ,
1949+ ] ;
1950+ for marked_null in marked_nulls {
1951+ let all_null = case (
1952+ None ,
1953+ vec ! [ ( lit( true ) , marked_null) ] ,
1954+ Some ( lit ( ScalarValue :: Null ) ) ,
1955+ ) ?;
1956+ let type_only_cast: Arc < dyn PhysicalExpr > =
1957+ Arc :: new ( CastExpr :: new ( all_null, DataType :: LargeBinary , None ) ) ;
1958+ let outer = case (
1959+ None ,
1960+ vec ! [ ( lit( true ) , type_only_cast) ] ,
1961+ Some ( col ( "a" , & schema) ?) ,
1962+ ) ?;
1963+ assert ! ( outer. return_field( & schema) ?. metadata( ) . is_empty( ) ) ;
1964+ }
1965+ Ok ( ( ) )
1966+ }
1967+
19151968 #[ test]
19161969 fn nested_case_metadata_field_names_scale_linearly ( ) -> Result < ( ) > {
19171970 let metadata = HashMap :: from ( [ ( "logical" . to_string ( ) , "binary" . to_string ( ) ) ] ) ;
0 commit comments