Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion src/cli/ast/helpers/where_condition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub fn get_condition(parser: &mut Parser) -> Result<WhereCondition, String> {
parser.advance()?;

let token = parser.current_token()?;
let operator = match token.token_type {
let mut operator = match token.token_type {
TokenTypes::Equals => Operator::Equals,
TokenTypes::NotEquals => Operator::NotEquals,
TokenTypes::LessThan => Operator::LessThan,
Expand All @@ -17,6 +17,7 @@ pub fn get_condition(parser: &mut Parser) -> Result<WhereCondition, String> {
TokenTypes::GreaterEquals => Operator::GreaterEquals,
TokenTypes::In => Operator::In,
TokenTypes::Not => Operator::NotIn,
TokenTypes::Is => Operator::Is,
_ => return Err(parser.format_error()),
};
parser.advance()?;
Expand All @@ -35,6 +36,12 @@ pub fn get_condition(parser: &mut Parser) -> Result<WhereCondition, String> {
r_side: r_side,
});
}

if operator == Operator::Is && parser.current_token()?.token_type == TokenTypes::Not {
operator = Operator::IsNot;
parser.advance()?;
}

let r_side = get_operand(parser)?;
parser.advance()?;

Expand Down Expand Up @@ -219,4 +226,43 @@ mod tests {
assert!(result.is_err());
assert_eq!(result.unwrap_err(), "Error at line 1, column 0: Unexpected value: (");
}

#[test]
fn where_condition_handles_is_operator() {
// id IS NULL;...
let tokens = vec![
token(TokenTypes::Identifier, "id"),
token(TokenTypes::Is, "IS"),
token(TokenTypes::Null, "NULL"),
token(TokenTypes::SemiColon, ";"),
];
let mut parser = Parser::new(tokens);
let result = get_condition(&mut parser);
let expected = WhereCondition {
l_side: Operand::Identifier("id".to_string()),
operator: Operator::Is,
r_side: Operand::Value(Value::Null),
};
assert_where_condition(result, expected, &mut parser);
}

#[test]
fn where_condition_handles_is_not_operator() {
// id IS NOT name;...
let tokens = vec![
token(TokenTypes::Identifier, "id"),
token(TokenTypes::Is, "IS"),
token(TokenTypes::Not, "NOT"),
token(TokenTypes::Null, "NULL"),
token(TokenTypes::SemiColon, ";"),
];
let mut parser = Parser::new(tokens);
let result = get_condition(&mut parser);
let expected = WhereCondition {
l_side: Operand::Identifier("id".to_string()),
operator: Operator::IsNot,
r_side: Operand::Value(Value::Null),
};
assert_where_condition(result, expected, &mut parser);
}
}
2 changes: 2 additions & 0 deletions src/cli/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ pub enum Operator {
GreaterEquals,
In,
NotIn,
Is,
IsNot,
}

#[derive(Debug, PartialEq)]
Expand Down
1 change: 1 addition & 0 deletions src/cli/tokenizer/scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ impl<'a> Scanner<'a> {
slice if slice.eq_ignore_ascii_case("THEN") => TokenTypes::Then,
slice if slice.eq_ignore_ascii_case("ELSE") => TokenTypes::Else,
slice if slice.eq_ignore_ascii_case("END") => TokenTypes::End,
slice if slice.eq_ignore_ascii_case("IS") => TokenTypes::Is,
slice if slice.eq_ignore_ascii_case("COUNT") => TokenTypes::Count,
slice if slice.eq_ignore_ascii_case("SUM") => TokenTypes::Sum,
slice if slice.eq_ignore_ascii_case("AVG") => TokenTypes::Avg,
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tokenizer/token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub enum TokenTypes {
Limit, Offset,
// Logical Operators
And, Or, In, Exists,
Case, When, Then, Else, End,
Case, When, Then, Else, End, Is,
Equals, NotEquals, LessThan, LessEquals, GreaterThan, GreaterEquals,
// Aggregate Functions
Count, Sum, Avg, Min, Max,
Expand Down
1 change: 1 addition & 0 deletions src/db/table/select/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
pub mod where_stack;
pub mod where_condition;
pub mod limit_clause;
pub mod order_by_clause;
use crate::db::table::{Table, Value};
Expand Down
Loading
Loading