Merge branch 'main' into support_colon_eq_operator_mysql

Author: barsela1

src/ast/mod.rs

@@ -1027,7 +1027,7 @@ pub enum Expr {
     /// [(1)]: https://dev.mysql.com/doc/refman/8.0/en/fulltext-search.html#function_match
     MatchAgainst {
         /// `(<col>, <col>, ...)`.
-        columns: Vec<Ident>,
+        columns: Vec<ObjectName>,
         /// `<expr>`.
         match_value: Value,
         /// `<search modifier>`

src/parser/mod.rs

@@ -2704,7 +2704,7 @@ impl<'a> Parser<'a> {
     /// This method will raise an error if the column list is empty or with invalid identifiers,
     /// the match expression is not a literal string, or if the search modifier is not valid.
     pub fn parse_match_against(&mut self) -> Result<Expr, ParserError> {
-        let columns = self.parse_parenthesized_column_list(Mandatory, false)?;
+        let columns = self.parse_parenthesized_qualified_column_list(Mandatory, false)?;
 
         self.expect_keyword_is(Keyword::AGAINST)?;
 

tests/sqlparser_mysql.rs

@@ -3455,6 +3455,34 @@ fn parse_cast_integers() {
         .expect_err("CAST doesn't allow display width");
 }
 
+fn parse_match_against_with_alias() {
+    let sql = "SELECT tbl.ProjectID FROM surveys.tbl1 AS tbl WHERE MATCH (tbl.ReferenceID) AGAINST ('AAA' IN BOOLEAN MODE)";
+    match mysql().verified_stmt(sql) {
+        Statement::Query(query) => match *query.body {
+            SetExpr::Select(select) => match select.selection {
+                Some(Expr::MatchAgainst {
+                    columns,
+                    match_value,
+                    opt_search_modifier,
+                }) => {
+                    assert_eq!(
+                        columns,
+                        vec![ObjectName::from(vec![
+                            Ident::new("tbl"),
+                            Ident::new("ReferenceID")
+                        ])]
+                    );
+                    assert_eq!(match_value, Value::SingleQuotedString("AAA".to_owned()));
+                    assert_eq!(opt_search_modifier, Some(SearchModifier::InBooleanMode));
+                }
+                _ => unreachable!(),
+            },
+            _ => unreachable!(),
+        },
+        _ => unreachable!(),
+    }
+}
+
 #[test]
 fn test_variable_assignment_using_colon_equal() {
     let sql_select = "SELECT @price := price, @tax := price * 0.1 FROM products WHERE id = 1";