Add REGEXP infix operator for MySQL

src/ast/operator.rs

@@ -85,6 +85,8 @@ pub enum BinaryOperator {
  BitwiseOr,
  BitwiseAnd,
  BitwiseXor,
+ // MySQL & Sqlite use `REGEXP` as an infix operator
+ Regexp,
  PGBitwiseXor,
  PGBitwiseShiftLeft,
  PGBitwiseShiftRight,
@@ -122,6 +124,7 @@ impl fmt::Display for BinaryOperator {
  BinaryOperator::BitwiseOr => f.write_str("|"),
  BinaryOperator::BitwiseAnd => f.write_str("&"),
  BinaryOperator::BitwiseXor => f.write_str("^"),
+ BinaryOperator::Regexp => f.write_str("REGEXP"),
  BinaryOperator::PGBitwiseXor => f.write_str("#"),
  BinaryOperator::PGBitwiseShiftLeft => f.write_str("<<"),
  BinaryOperator::PGBitwiseShiftRight => f.write_str(">>"),

src/dialect/mysql.rs

@@ -10,7 +10,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::dialect::Dialect;
+#[cfg(not(feature = "std"))]
+use alloc::boxed::Box;
+
+use crate::{
+ ast::{BinaryOperator, Expr},
+ dialect::Dialect,
+ keywords::Keyword,
+};
 
 /// [MySQL](https://www.mysql.com/)
 #[derive(Debug)]
@@ -35,4 +42,22 @@ impl Dialect for MySqlDialect {
  fn is_delimited_identifier_start(&self, ch: char) -> bool {
  ch == '`'
  }
+
+ fn parse_infix(
+ &self,
+ _parser: &mut crate::parser::Parser,
+ _expr: &crate::ast::Expr,
+ _precedence: u8,
+ ) -> Option<Result<crate::ast::Expr, crate::parser::ParserError>> {
+ // Parse REGEXP as an operator
+ if _parser.parse_keyword(Keyword::REGEXP) {
+ Some(Ok(Expr::BinaryOp {
+ left: Box::new(_expr.clone()),
+ op: BinaryOperator::Regexp,
+ right: Box::new(_parser.parse_expr().unwrap()),
+ }))
+ } else {
+ None
+ }
+ }
 }

src/dialect/sqlite.rs

@@ -10,7 +10,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::ast::Statement;
+#[cfg(not(feature = "std"))]
+use alloc::boxed::Box;
+
+use crate::ast::{BinaryOperator, Expr, Statement};
 use crate::dialect::Dialect;
 use crate::keywords::Keyword;
 use crate::parser::{Parser, ParserError};
@@ -47,4 +50,22 @@ impl Dialect for SQLiteDialect {
  None
  }
  }
+
+ fn parse_infix(
+ &self,
+ _parser: &mut crate::parser::Parser,
+ _expr: &crate::ast::Expr,
+ _precedence: u8,
+ ) -> Option<Result<crate::ast::Expr, crate::parser::ParserError>> {
+ // Parse REGEXP as an operator
+ if _parser.parse_keyword(Keyword::REGEXP) {
+ Some(Ok(Expr::BinaryOp {
+ left: Box::new(_expr.clone()),
+ op: BinaryOperator::Regexp,
+ right: Box::new(_parser.parse_expr().unwrap()),
+ }))
+ } else {
+ None
+ }
+ }
 }

src/keywords.rs

@@ -473,6 +473,7 @@ define_keywords!(
  REFERENCES,
  REFERENCING,
  REGCLASS,
+ REGEXP,
  REGR_AVGX,
  REGR_AVGY,
  REGR_COUNT,

src/parser.rs

@@ -2029,6 +2029,7 @@ impl<'a> Parser<'a> {
  Token::Word(w) if w.keyword == Keyword::ILIKE => Ok(Self::LIKE_PREC),
  Token::Word(w) if w.keyword == Keyword::SIMILAR => Ok(Self::LIKE_PREC),
  Token::Word(w) if w.keyword == Keyword::OPERATOR => Ok(Self::BETWEEN_PREC),
+ Token::Word(w) if w.keyword == Keyword::REGEXP => Ok(Self::LIKE_PREC),
  Token::Eq
  | Token::Lt
  | Token::LtEq

tests/sqlparser_mysql.rs

@@ -1407,3 +1407,8 @@ fn parse_string_introducers() {
  mysql().one_statement_parses_to("SELECT _utf8mb4'abc'", "SELECT _utf8mb4 'abc'");
  mysql().verified_stmt("SELECT _binary 'abc', _utf8mb4 'abc'");
 }
+
+#[test]
+fn parse_regexp_infix() {
+ mysql().verified_stmt(r#"SELECT 'Michael!' REGEXP '.*'"#);
+}

tests/sqlparser_sqlite.rs

@@ -256,3 +256,8 @@ fn sqlite_and_generic() -> TestedDialects {
  options: None,
  }
 }
+
+#[test]
+fn parse_regexp_infix() {
+ sqlite().verified_stmt(r#"SELECT 'Michael!' REGEXP '.*'"#);
+}