fix(parser): parse mysql fulltext AGAINST concat expression

Author: dengliming

src/main/java/net/sf/jsqlparser/expression/operators/relational/FullTextSearch.java

@@ -9,6 +9,10 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Optional;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.expression.JdbcNamedParameter;
@@ -17,11 +21,6 @@
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Optional;
-
 public class FullTextSearch extends ASTNodeAccessImpl implements Expression {
 
     private ExpressionList<Column> _matchColumns;
@@ -44,16 +43,20 @@ public Expression getAgainstValue() {
         return this._againstValue;
     }
 
-    public void setAgainstValue(StringValue val) {
+    public void setAgainstValue(Expression val) {
         this._againstValue = val;
     }
 
+    public void setAgainstValue(StringValue val) {
+        setAgainstValue((Expression) val);
+    }
+
     public void setAgainstValue(JdbcNamedParameter val) {
-        this._againstValue = val;
+        setAgainstValue((Expression) val);
     }
 
     public void setAgainstValue(JdbcParameter val) {
-        this._againstValue = val;
+        setAgainstValue((Expression) val);
     }
 
     public String getSearchModifier() {
@@ -92,6 +95,10 @@ public FullTextSearch withMatchColumns(ExpressionList<Column> matchColumns) {
     }
 
     public FullTextSearch withAgainstValue(StringValue againstValue) {
+        return withAgainstValue((Expression) againstValue);
+    }
+
+    public FullTextSearch withAgainstValue(Expression againstValue) {
         this.setAgainstValue(againstValue);
         return this;
     }

src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java

@@ -275,6 +275,7 @@ public <S> Void visit(ExcludesExpression excludesExpression, S context) {
     @Override
     public <S> Void visit(FullTextSearch fullTextSearch, S context) {
         validateOptionalExpressions(fullTextSearch.getMatchColumns());
+        validateOptionalExpression(fullTextSearch.getAgainstValue(), this);
         return null;
     }
 

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -8810,22 +8810,14 @@ Execute Execute(): {
 
 FullTextSearch FullTextSearch() : {
     Token searchModifier;
-    Token againstValue;
-    JdbcParameter jdbcParameter;
-    JdbcNamedParameter jdbcNamedParameter;
+    Expression againstValue;
     FullTextSearch fs = new FullTextSearch();
     ExpressionList<Column> matchedColumns;
 }
 {
     <K_MATCH> "(" matchedColumns=ColumnList() ")" <K_AGAINST>
     "("
-    (
-      againstValue=<S_CHAR_LITERAL> { fs.setAgainstValue(new StringValue(againstValue.image)); }
-      |
-      jdbcParameter=JdbcParameter() { fs.setAgainstValue(  jdbcParameter ); }
-      |
-      jdbcNamedParameter=JdbcNamedParameter() { fs.setAgainstValue(  jdbcNamedParameter ); }
-    )
+    againstValue=SimpleExpression() { fs.setAgainstValue(againstValue); }
     [
         (
             searchModifier="IN NATURAL LANGUAGE MODE"

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -55,6 +55,7 @@
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.expression.operators.relational.FullTextSearch;
 import net.sf.jsqlparser.expression.operators.relational.GreaterThan;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
 import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
@@ -2279,6 +2280,18 @@ public void testFullTextSearchInDefaultMode() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(statement);
     }
 
+    @Test
+    public void testFullTextSearchAgainstFunctionInBooleanMode() throws JSQLParserException {
+        String statement =
+                "SELECT MATCH (name) AGAINST (concat('',?,'') IN BOOLEAN MODE) AS full_text FROM commodity";
+        Select select = (Select) assertSqlCanBeParsedAndDeparsed(statement);
+        FullTextSearch fullTextSearch = assertInstanceOf(FullTextSearch.class,
+                select.getPlainSelect().getSelectItem(0).getExpression());
+
+        assertInstanceOf(Function.class, fullTextSearch.getAgainstValue());
+        assertEquals("IN BOOLEAN MODE", fullTextSearch.getSearchModifier());
+    }
+
     @Test
     public void testIsTrue() throws JSQLParserException {
         String statement = "SELECT col FROM tbl WHERE col IS TRUE";

src/test/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidatorTest.java

@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.util.validation.validator;
 
 import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.parser.feature.Feature;
 import net.sf.jsqlparser.util.validation.ValidationTestAsserts;
 import net.sf.jsqlparser.util.validation.feature.DatabaseType;
 import net.sf.jsqlparser.util.validation.feature.FeaturesAllowed;
@@ -216,6 +217,16 @@ public void testOneColumnFullTextSearchMySQL() throws JSQLParserException {
                 EXPRESSIONS);
     }
 
+    @Test
+    public void testFullTextSearchAgainstFunctionRequiresJdbcFeature() throws JSQLParserException {
+        validateNotAllowed(
+                "SELECT * FROM commodity WHERE MATCH (name) AGAINST (concat('',?,'') IN BOOLEAN MODE)",
+                1,
+                1,
+                EXPRESSIONS,
+                Feature.jdbcParameter);
+    }
+
     @Test
     public void testAnalyticFunctionFilter() throws JSQLParserException {
         validateNoErrors(