Skip to content

Add support for the LIKE ANY and ILIKE ANY pattern-matching condition #1456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Add support for the LIKE ANY and ILIKE ANY pattern-matching condition #1456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c50f81
Add support for the ANY keyword after LIKE AND ILIKE
yoavcloud Oct 4, 2024
402251a
Code review comments
yoavcloud Oct 4, 2024
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
16 changes: 12 additions & 4 deletions src/ast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,13 +613,15 @@ pub enum Expr {
/// `[NOT] LIKE <pattern> [ESCAPE <escape_character>]`
Like {
negated: bool,
any: bool,
expr: Box<Expr>,
pattern: Box<Expr>,
escape_char: Option<String>,
},
/// `ILIKE` (case-insensitive `LIKE`)
ILike {
negated: bool,
any: bool,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we add a link to the snowflake doc where the syntax is mentioned? It would help with context for someone that comes across it in the codebase

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in the latest commit

expr: Box<Expr>,
pattern: Box<Expr>,
escape_char: Option<String>,
Expand Down Expand Up @@ -1242,20 +1244,23 @@ impl fmt::Display for Expr {
expr,
pattern,
escape_char,
any,
} => match escape_char {
Some(ch) => write!(
f,
"{} {}LIKE {} ESCAPE '{}'",
"{} {}LIKE {}{} ESCAPE '{}'",
expr,
if *negated { "NOT " } else { "" },
if *any { "ANY " } else { "" },
pattern,
ch
),
_ => write!(
f,
"{} {}LIKE {}",
"{} {}LIKE {}{}",
expr,
if *negated { "NOT " } else { "" },
if *any { "ANY " } else { "" },
pattern
),
},
Expand All @@ -1264,20 +1269,23 @@ impl fmt::Display for Expr {
expr,
pattern,
escape_char,
any,
} => match escape_char {
Some(ch) => write!(
f,
"{} {}ILIKE {} ESCAPE '{}'",
"{} {}ILIKE {}{} ESCAPE '{}'",
expr,
if *negated { "NOT " } else { "" },
if *any { "ANY" } else { "" },
pattern,
ch
),
_ => write!(
f,
"{} {}ILIKE {}",
"{} {}ILIKE {}{}",
expr,
if *negated { "NOT " } else { "" },
if *any { "ANY " } else { "" },
pattern
),
},
Expand Down
6 changes: 6 additions & 0 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2734,6 +2734,10 @@ impl<'a> Parser<'a> {
let regexp = self.parse_keyword(Keyword::REGEXP);
let rlike = self.parse_keyword(Keyword::RLIKE);
if regexp || rlike {
if self.parse_keyword(Keyword::ANY) {
self.prev_token();
return self.expected("pattern after RLIKE or REGEXP", self.peek_token());
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah not sure I followed this part, we don't seem to take any action for when parsing ANY is successful?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only point of this condition was to add a meaningful error message when parsing incorrect syntax, for example: RLIKE ANY. See the last check of the unit test. Can be removed, I debated this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in the latest commit.

Ok(Expr::RLike {
negated,
expr: Box::new(expr),
Expand All @@ -2749,6 +2753,7 @@ impl<'a> Parser<'a> {
} else if self.parse_keyword(Keyword::LIKE) {
Ok(Expr::Like {
negated,
any: self.parse_keyword(Keyword::ANY),
expr: Box::new(expr),
pattern: Box::new(
self.parse_subexpr(self.dialect.prec_value(Precedence::Like))?,
Expand All @@ -2758,6 +2763,7 @@ impl<'a> Parser<'a> {
} else if self.parse_keyword(Keyword::ILIKE) {
Ok(Expr::ILike {
negated,
any: self.parse_keyword(Keyword::ANY),
expr: Box::new(expr),
pattern: Box::new(
self.parse_subexpr(self.dialect.prec_value(Precedence::Like))?,
Expand Down
10 changes: 10 additions & 0 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,7 @@ fn parse_not_precedence() {
negated: true,
pattern: Box::new(Expr::Value(Value::SingleQuotedString("b".into()))),
escape_char: None,
any: false,
}),
},
);
Expand Down Expand Up @@ -1579,6 +1580,7 @@ fn parse_null_like() {
SelectItem::ExprWithAlias {
expr: Expr::Like {
expr: Box::new(Expr::Identifier(Ident::new("column1"))),
any: false,
negated: false,
pattern: Box::new(Expr::Value(Value::Null)),
escape_char: None,
Expand All @@ -1594,6 +1596,7 @@ fn parse_null_like() {
SelectItem::ExprWithAlias {
expr: Expr::Like {
expr: Box::new(Expr::Value(Value::Null)),
any: false,
negated: false,
pattern: Box::new(Expr::Identifier(Ident::new("column1"))),
escape_char: None,
Expand Down Expand Up @@ -1621,6 +1624,7 @@ fn parse_ilike() {
negated,
pattern: Box::new(Expr::Value(Value::SingleQuotedString("%a".to_string()))),
escape_char: None,
any: false,
},
select.selection.unwrap()
);
Expand All @@ -1637,6 +1641,7 @@ fn parse_ilike() {
negated,
pattern: Box::new(Expr::Value(Value::SingleQuotedString("%a".to_string()))),
escape_char: Some('^'.to_string()),
any: false,
},
select.selection.unwrap()
);
Expand All @@ -1654,6 +1659,7 @@ fn parse_ilike() {
negated,
pattern: Box::new(Expr::Value(Value::SingleQuotedString("%a".to_string()))),
escape_char: None,
any: false,
})),
select.selection.unwrap()
);
Expand All @@ -1676,6 +1682,7 @@ fn parse_like() {
negated,
pattern: Box::new(Expr::Value(Value::SingleQuotedString("%a".to_string()))),
escape_char: None,
any: false,
},
select.selection.unwrap()
);
Expand All @@ -1692,6 +1699,7 @@ fn parse_like() {
negated,
pattern: Box::new(Expr::Value(Value::SingleQuotedString("%a".to_string()))),
escape_char: Some('^'.to_string()),
any: false,
},
select.selection.unwrap()
);
Expand All @@ -1709,6 +1717,7 @@ fn parse_like() {
negated,
pattern: Box::new(Expr::Value(Value::SingleQuotedString("%a".to_string()))),
escape_char: None,
any: false,
})),
select.selection.unwrap()
);
Expand Down Expand Up @@ -10098,6 +10107,7 @@ fn test_selective_aggregation() {
expr: Box::new(Expr::Identifier(Ident::new("name"))),
pattern: Box::new(Expr::Value(Value::SingleQuotedString("a%".to_owned()))),
escape_char: None,
any: false,
})),
null_treatment: None,
over: None,
Expand Down
13 changes: 13 additions & 0 deletions tests/sqlparser_snowflake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2162,6 +2162,19 @@ fn test_select_wildcard_with_ilike_replace() {
);
}

#[test]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the syntax support was added for all dialects (I think seems reasonable), can we move the test to sqlparser_common.rs so that they run against all dialects?

fn test_select_where_with_like_or_ilike_any() {
snowflake().verified_stmt(r#"SELECT * FROM x WHERE a ILIKE ANY '%abc%'"#);
snowflake().verified_stmt(r#"SELECT * FROM x WHERE a LIKE ANY '%abc%'"#);
snowflake().verified_stmt(r#"SELECT * FROM x WHERE a ILIKE ANY ('%Jo%oe%', 'T%e')"#);
snowflake().verified_stmt(r#"SELECT * FROM x WHERE a LIKE ANY ('%Jo%oe%', 'T%e')"#);
let res = snowflake().parse_sql_statements(r#"SELECT * FROM x WHERE a RLIKE ANY '%abc%'"#);
assert_eq!(
res.unwrap_err().to_string(),
"sql parser error: Expected: pattern after RLIKE or REGEXP, found: ANY"
);
}

#[test]
fn first_value_ignore_nulls() {
snowflake().verified_only_select(concat!(
Expand Down