mirrors/datafusion-sqlparse
1
0
Fork 0
mirror of https://github.com/apache/datafusion-sqlparser-rs.git synced 2025-08-23 15:34:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implemented NOT LIKE

Browse source
This commit is contained in:
Andy Grove 2018-12-16 16:30:32 -07:00
parent 5d62167d6e
commit ee1944b9d9
3 changed files with 48 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sqlast/sql_operator.rs
View file

@ -16,6 +16,7 @@ pub enum SQLOperator {
Or, Or,
Not, Not,
Like, Like,
NotLike,
} }
impl ToString for SQLOperator { impl ToString for SQLOperator {
@ -36,6 +37,7 @@ impl ToString for SQLOperator {
SQLOperator::Or => "OR".to_string(), SQLOperator::Or => "OR".to_string(),
SQLOperator::Not => "NOT".to_string(), SQLOperator::Not => "NOT".to_string(),
SQLOperator::Like => "LIKE".to_string(), SQLOperator::Like => "LIKE".to_string(),
SQLOperator::NotLike => "NOT LIKE".to_string(),
} }
} }
} }

23
src/sqlparser.rs
View file

@ -275,8 +275,7 @@ impl Parser {
debug!("parsing infix"); debug!("parsing infix");
match self.next_token() { match self.next_token() {
Some(tok) => match tok { Some(tok) => match tok {
Token::Keyword(ref k) => { Token::Keyword(ref k) if k == "IS" => {
if k == "IS" {
if self.parse_keywords(vec!["NULL"]) { if self.parse_keywords(vec!["NULL"]) {
Ok(Some(ASTNode::SQLIsNull(Box::new(expr)))) Ok(Some(ASTNode::SQLIsNull(Box::new(expr))))
} else if self.parse_keywords(vec!["NOT", "NULL"]) { } else if self.parse_keywords(vec!["NOT", "NULL"]) {
@ -284,14 +283,23 @@ impl Parser {
} else { } else {
parser_err!("Invalid tokens after IS") parser_err!("Invalid tokens after IS")
} }
} else { }
Token::Keyword(ref k) if k == "NOT" => {
if self.parse_keywords(vec!["LIKE"]) {
Ok(Some(ASTNode::SQLBinaryExpr { Ok(Some(ASTNode::SQLBinaryExpr {
left: Box::new(expr),
op: SQLOperator::NotLike,
right: Box::new(self.parse_expr(precedence)?),
}))
} else {
parser_err!("Invalid tokens after NOT")
}
}
Token::Keyword(_) => Ok(Some(ASTNode::SQLBinaryExpr {
left: Box::new(expr), left: Box::new(expr),
op: self.to_sql_operator(&tok)?, op: self.to_sql_operator(&tok)?,
right: Box::new(self.parse_expr(precedence)?), right: Box::new(self.parse_expr(precedence)?),
})) })),
}
}
Token::Eq Token::Eq
| Token::Neq | Token::Neq
| Token::Gt | Token::Gt
@ -333,7 +341,7 @@ impl Parser {
&Token::Mod => Ok(SQLOperator::Modulus), &Token::Mod => Ok(SQLOperator::Modulus),
&Token::Keyword(ref k) if k == "AND" => Ok(SQLOperator::And), &Token::Keyword(ref k) if k == "AND" => Ok(SQLOperator::And),
&Token::Keyword(ref k) if k == "OR" => Ok(SQLOperator::Or), &Token::Keyword(ref k) if k == "OR" => Ok(SQLOperator::Or),
&Token::Keyword(ref k) if k == "NOT" => Ok(SQLOperator::Not), //&Token::Keyword(ref k) if k == "NOT" => Ok(SQLOperator::Not),
&Token::Keyword(ref k) if k == "LIKE" => Ok(SQLOperator::Like), &Token::Keyword(ref k) if k == "LIKE" => Ok(SQLOperator::Like),
_ => parser_err!(format!("Unsupported SQL operator {:?}", tok)), _ => parser_err!(format!("Unsupported SQL operator {:?}", tok)),
} }
@ -355,6 +363,7 @@ impl Parser {
match tok { match tok {
&Token::Keyword(ref k) if k == "OR" => Ok(5), &Token::Keyword(ref k) if k == "OR" => Ok(5),
&Token::Keyword(ref k) if k == "AND" => Ok(10), &Token::Keyword(ref k) if k == "AND" => Ok(10),
&Token::Keyword(ref k) if k == "NOT" => Ok(15),
&Token::Keyword(ref k) if k == "IS" => Ok(15), &Token::Keyword(ref k) if k == "IS" => Ok(15),
&Token::Keyword(ref k) if k == "LIKE" => Ok(20), &Token::Keyword(ref k) if k == "LIKE" => Ok(20),
&Token::Eq | &Token::Lt | &Token::LtEq | &Token::Neq | &Token::Gt | &Token::GtEq => { &Token::Eq | &Token::Lt | &Token::LtEq | &Token::Neq | &Token::Gt | &Token::GtEq => {

22
tests/sqlparser_postgres.rs
View file

@ -753,3 +753,25 @@ fn parse_like() {
_ => assert!(false), _ => assert!(false),
} }
} }
#[test]
fn parse_not_like() {
let sql = String::from("SELECT * FROM customers WHERE name NOT LIKE '%a'");
let ast = parse_sql(&sql);
assert_eq!(sql, ast.to_string());
match ast {
ASTNode::SQLSelect { selection, .. } => {
assert_eq!(
ASTNode::SQLBinaryExpr {
left: Box::new(ASTNode::SQLIdentifier("name".to_string())),
op: SQLOperator::NotLike,
right: Box::new(ASTNode::SQLValue(Value::SingleQuotedString(
"%a".to_string()
))),
},
*selection.unwrap()
);
}
_ => assert!(false),
}
}