forked from extern/nushell
Change comparison operators to allow nulls (#8617)
Prior to this PR, the less/greater than operators (`<`, `>`, `<=`, `>=`) would throw an error if either side was null. After this PR, these operators return null if either side (or both) is null. ### Examples ```bash 1 < 3 # true 1 < null # null null < 3 # null null < null # null ``` ### Motivation JT [asked the C# folks](https://discord.com/channels/601130461678272522/615329862395101194/1086137515053957140) and this is apparently the approach they would choose for comparison operators if they could start from scratch. This PR makes `where` more convenient to use on jagged/missing data. For example, we can now filter on columns that may not be present in every row: ``` > [{foo: 123} {}] | where foo? > 10 ╭───┬─────╮ │ # │ foo │ ├───┼─────┤ │ 0 │ 123 │ ╰───┴─────╯ ```
This commit is contained in:
@ -2658,6 +2658,10 @@ impl Value {
|
||||
return lhs.operation(*span, Operator::Comparison(Comparison::LessThan), op, rhs);
|
||||
}
|
||||
|
||||
if matches!(self, Value::Nothing { .. }) || matches!(rhs, Value::Nothing { .. }) {
|
||||
return Ok(Value::nothing(span));
|
||||
}
|
||||
|
||||
if !type_compatible(self.get_type(), rhs.get_type())
|
||||
&& (self.get_type() != Type::Any)
|
||||
&& (rhs.get_type() != Type::Any)
|
||||
@ -2697,6 +2701,10 @@ impl Value {
|
||||
);
|
||||
}
|
||||
|
||||
if matches!(self, Value::Nothing { .. }) || matches!(rhs, Value::Nothing { .. }) {
|
||||
return Ok(Value::nothing(span));
|
||||
}
|
||||
|
||||
if !type_compatible(self.get_type(), rhs.get_type())
|
||||
&& (self.get_type() != Type::Any)
|
||||
&& (rhs.get_type() != Type::Any)
|
||||
@ -2734,6 +2742,10 @@ impl Value {
|
||||
);
|
||||
}
|
||||
|
||||
if matches!(self, Value::Nothing { .. }) || matches!(rhs, Value::Nothing { .. }) {
|
||||
return Ok(Value::nothing(span));
|
||||
}
|
||||
|
||||
if !type_compatible(self.get_type(), rhs.get_type())
|
||||
&& (self.get_type() != Type::Any)
|
||||
&& (rhs.get_type() != Type::Any)
|
||||
@ -2771,6 +2783,10 @@ impl Value {
|
||||
);
|
||||
}
|
||||
|
||||
if matches!(self, Value::Nothing { .. }) || matches!(rhs, Value::Nothing { .. }) {
|
||||
return Ok(Value::nothing(span));
|
||||
}
|
||||
|
||||
if !type_compatible(self.get_type(), rhs.get_type())
|
||||
&& (self.get_type() != Type::Any)
|
||||
&& (rhs.get_type() != Type::Any)
|
||||
|
Reference in New Issue
Block a user