Compare NULL types (apache#5158)

sunchao · Feb 2, 2023 · 7d2d51b · 7d2d51b
1 parent e41c4df
commit 7d2d51b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_type_coercion.slt b/datafusion/core/tests/sqllogictests/test_files/pg_compat/pg_compat_type_coercion.slt
@@ -95,20 +95,17 @@ select pg_typeof(false or true), pg_typeof(true or false);
 bool bool
 
 
-# TODO: run for DataFusion as well after #4335
-onlyif postgres
 query ??
 select null and null, null or null;
 ----
 NULL NULL
 
 
-# TODO: uncomment after #4335
-#onlyif DataFusion
-#query ??
-#select arrow_typeof(null and null), arrow_typeof(null or null);
-#----
-#Boolean Boolean
+onlyif DataFusion
+query ??
+select arrow_typeof(null and null), arrow_typeof(null or null);
+----
+Boolean Boolean
 
 
 onlyif postgres

diff --git a/datafusion/expr/src/type_coercion/binary.rs b/datafusion/expr/src/type_coercion/binary.rs
@@ -100,7 +100,7 @@ pub fn coerce_types(
  Operator::And | Operator::Or => match (lhs_type, rhs_type) {
  // logical binary boolean operators can only be evaluated in bools or nulls
  (DataType::Boolean, DataType::Boolean) => Some(DataType::Boolean),
- (DataType::Null, DataType::Null) => Some(DataType::Null),
+ (DataType::Null, DataType::Null) => Some(DataType::Boolean),
  (DataType::Boolean, DataType::Null) | (DataType::Null, DataType::Boolean) => {
  Some(DataType::Boolean)
  }
@@ -1144,13 +1144,13 @@ mod tests {
  DataType::Null,
  DataType::Null,
  Operator::Or,
- DataType::Null
+ DataType::Boolean
  );
  test_coercion_binary_rule!(
  DataType::Null,
  DataType::Null,
  Operator::And,
- DataType::Null
+ DataType::Boolean
  );
  test_coercion_binary_rule!(
  DataType::Null,