feat(query): fix tests

Author: sundy-li

src/query/functions-v2/src/scalars/boolean.rs

@@ -45,6 +45,30 @@ pub fn register(registry: &mut FunctionRegistry) {
         |lhs, rhs| lhs & rhs,
     );
 
+    registry.register_2_arg_core::<BooleanType, BooleanType, BooleanType, _, _>(
+        "and",
+        FunctionProperty::default(),
+        |lhs, rhs| {
+            Some(BooleanDomain {
+                has_false: lhs.has_false || rhs.has_false,
+                has_true: lhs.has_true && rhs.has_true,
+            })
+        },
+        vectorize_2_arg::<BooleanType, BooleanType, BooleanType>(|lhs, rhs| lhs & rhs),
+    );
+
+    registry.register_2_arg_core::<BooleanType, BooleanType, BooleanType, _, _>(
+        "or",
+        FunctionProperty::default(),
+        |lhs, rhs| {
+            Some(BooleanDomain {
+                has_false: lhs.has_false && rhs.has_false,
+                has_true: lhs.has_true || rhs.has_true,
+            })
+        },
+        vectorize_2_arg::<BooleanType, BooleanType, BooleanType>(|lhs, rhs| lhs | rhs),
+    );
+
     // https://en.wikibooks.org/wiki/Structured_Query_Language/NULLs_and_the_Three_Valued_Logic
     registry.register_2_arg_core::<NullableType<BooleanType>, NullableType<BooleanType>, NullableType<BooleanType>, _, _>(
         "and",
@@ -82,30 +106,6 @@ pub fn register(registry: &mut FunctionRegistry) {
         }),
     );
 
-    registry.register_2_arg_core::<BooleanType, BooleanType, BooleanType, _, _>(
-        "and",
-        FunctionProperty::default(),
-        |lhs, rhs| {
-            Some(BooleanDomain {
-                has_false: lhs.has_false || rhs.has_false,
-                has_true: lhs.has_true && rhs.has_true,
-            })
-        },
-        vectorize_2_arg::<BooleanType, BooleanType, BooleanType>(|lhs, rhs| lhs & rhs),
-    );
-
-    registry.register_2_arg_core::<BooleanType, BooleanType, BooleanType, _, _>(
-        "or",
-        FunctionProperty::default(),
-        |lhs, rhs| {
-            Some(BooleanDomain {
-                has_false: lhs.has_false && rhs.has_false,
-                has_true: lhs.has_true || rhs.has_true,
-            })
-        },
-        vectorize_2_arg::<BooleanType, BooleanType, BooleanType>(|lhs, rhs| lhs | rhs),
-    );
-
     registry.register_2_arg::<BooleanType, BooleanType, BooleanType, _, _>(
         "xor",
         FunctionProperty::default(),

src/query/functions-v2/tests/it/scalars/testdata/boolean.txt

@@ -1,9 +1,9 @@
 ast            : true AND false
 raw expr       : and(true, false)
-checked expr   : and<Boolean NULL, Boolean NULL>(CAST(true AS Boolean NULL), CAST(false AS Boolean NULL))
+checked expr   : and<Boolean, Boolean>(true, false)
 optimized expr : false
-output type    : Boolean NULL
-output domain  : Unknown
+output type    : Boolean
+output domain  : {FALSE}
 output         : false
 
 
@@ -18,19 +18,19 @@ output         : false
 
 ast            : true AND true
 raw expr       : and(true, true)
-checked expr   : and<Boolean NULL, Boolean NULL>(CAST(true AS Boolean NULL), CAST(true AS Boolean NULL))
+checked expr   : and<Boolean, Boolean>(true, true)
 optimized expr : true
-output type    : Boolean NULL
-output domain  : Unknown
+output type    : Boolean
+output domain  : {TRUE}
 output         : true
 
 
 ast            : false AND false
 raw expr       : and(false, false)
-checked expr   : and<Boolean NULL, Boolean NULL>(CAST(false AS Boolean NULL), CAST(false AS Boolean NULL))
+checked expr   : and<Boolean, Boolean>(false, false)
 optimized expr : false
-output type    : Boolean NULL
-output domain  : Unknown
+output type    : Boolean
+output domain  : {FALSE}
 output         : false
 
 
@@ -45,10 +45,10 @@ output         : NULL
 
 ast            : false AND true
 raw expr       : and(false, true)
-checked expr   : and<Boolean NULL, Boolean NULL>(CAST(false AS Boolean NULL), CAST(true AS Boolean NULL))
+checked expr   : and<Boolean, Boolean>(false, true)
 optimized expr : false
-output type    : Boolean NULL
-output domain  : Unknown
+output type    : Boolean
+output domain  : {FALSE}
 output         : false
 
 
@@ -129,10 +129,10 @@ evaluation (internal):
 
 ast            : true OR false
 raw expr       : or(true, false)
-checked expr   : or<Boolean NULL, Boolean NULL>(CAST(true AS Boolean NULL), CAST(false AS Boolean NULL))
+checked expr   : or<Boolean, Boolean>(true, false)
 optimized expr : true
-output type    : Boolean NULL
-output domain  : Unknown
+output type    : Boolean
+output domain  : {TRUE}
 output         : true