Merge pull request #824 from tomershay/support_default_mode_in_full_text_search

Support default mode in full text search

Author: wumpz

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

@@ -69,6 +69,8 @@ public String toString() {
                 columnsListCommaSeperated += ",";
             }
         }
-        return "MATCH (" + columnsListCommaSeperated + ") AGAINST (" + this._againstValue + " " + this._searchModifier + ")";
+
+        return "MATCH (" + columnsListCommaSeperated + ") AGAINST (" + this._againstValue +
+                (this._searchModifier != null ? " " + this._searchModifier : "") + ")";
     }
 }

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -215,7 +215,8 @@ public void visit(FullTextSearch fullTextSearch) {
                 columnsListCommaSeperated += ",";
             }
         }
-        buffer.append("MATCH (" + columnsListCommaSeperated + ") AGAINST (" + fullTextSearch.getAgainstValue() + " " + fullTextSearch.getSearchModifier() + ")");
+        buffer.append("MATCH (" + columnsListCommaSeperated + ") AGAINST (" + fullTextSearch.getAgainstValue() +
+                (fullTextSearch.getSearchModifier() != null ? " " + fullTextSearch.getSearchModifier() : "") + ")");
     }
 
     @Override

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

@@ -3239,13 +3239,15 @@ FullTextSearch FullTextSearch() : {
 {
     <K_MATCH> "(" col=Column() { matchedColumns.add(col); } ("," col=Column() { matchedColumns.add(col); } )* ")" <K_AGAINST>
     "(" againstValue=<S_CHAR_LITERAL> { fs.setAgainstValue(new StringValue(againstValue.image)); }
-        (
-            searchModifier="IN NATURAL LANGUAGE MODE"
-            | searchModifier="IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION"
-            | searchModifier="IN BOOLEAN MODE"
-            | searchModifier="WITH QUERY EXPANSION"
-        )
-        { fs.setSearchModifier(searchModifier.image); }
+        [
+            (
+                searchModifier="IN NATURAL LANGUAGE MODE"
+                | searchModifier="IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION"
+                | searchModifier="IN BOOLEAN MODE"
+                | searchModifier="WITH QUERY EXPANSION"
+            )
+            { fs.setSearchModifier(searchModifier.image); }
+        ]
     ")"
     {
         fs.setMatchColumns(matchedColumns);

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

@@ -1864,6 +1864,12 @@ public void testSeveralColumnsFullTextSearchMySQL() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(statement);
     }
 
+    @Test
+    public void testFullTextSearchInDefaultMode() throws JSQLParserException {
+        String statement = "SELECT col FROM tbl WHERE MATCH (col1,col2,col3) AGAINST ('test') ORDER BY col";
+        assertSqlCanBeParsedAndDeparsed(statement);
+    }
+
     @Test
     public void testIsTrue() throws JSQLParserException {
         String statement = "SELECT col FROM tbl WHERE col IS TRUE";