Merge origin/master into rewrite-simplecharstream

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/statement/select/Join.java

@@ -26,6 +26,7 @@ public class Join extends ASTNodeAccessImpl {
     private boolean simple = false;
     private boolean cross = false;
     private boolean semi = false;
+    private boolean straight = false;
     private FromItem rightItem;
     private Expression onExpression;
     private List<Column> usingColumns;
@@ -47,6 +48,14 @@ public void setInner(boolean b) {
         inner = b;
     }
 
+    public boolean isStraight() {
+        return straight;
+    }
+
+    public void setStraight(boolean b) {
+        straight = b;
+    }
+
     /**
      * Whether is a "OUTER" join
      *
@@ -210,7 +219,13 @@ public String toString() {
                 type += "SEMI ";
             }
 
-            return type + "JOIN " + rightItem + ((joinWindow != null) ? " WITHIN " + joinWindow : "")
+            if (!isStraight()) {
+                type += "JOIN ";
+            } else {
+                type = "STRAIGHT_JOIN ";
+            }
+
+            return type + rightItem + ((joinWindow != null) ? " WITHIN " + joinWindow : "")
                     + ((onExpression != null) ? " ON " + onExpression + "" : "")
                     + PlainSelect.getFormatedList(usingColumns, "USING", true, true);
         }

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/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java

@@ -354,7 +354,11 @@ public void deparseJoin(Join join) {
                 buffer.append(" SEMI");
             }
 
-            buffer.append(" JOIN ");
+            if (!join.isStraight()) {
+                buffer.append(" JOIN ");
+            } else {
+                buffer.append(" STRAIGHT_JOIN ");
+            }
 
         }
 

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

@@ -189,6 +189,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_IN:"IN">
 |   <K_INDEX: "INDEX">
 |   <K_INNER:"INNER">
+|   <K_STRAIGHT:"STRAIGHT_JOIN">
 |   <K_INSERT:"INSERT">
 |   <K_INTERSECT:"INTERSECT">
 |   <K_INTERVAL:"INTERVAL">
@@ -1740,10 +1741,11 @@ Join JoinerExpression() #JoinerExpression:
            ) [ <K_OUTER> { join.setOuter(true); } ]
         | <K_INNER> { join.setInner(true); }
         | <K_NATURAL> { join.setNatural(true); }
-        | <K_CROSS> { join.setCross(true); } 
+        | <K_CROSS> { join.setCross(true); }
     ]
 
-          ( <K_JOIN> | "," { join.setSimple(true); } (<K_OUTER> { join.setOuter(true); } )? ) 
+          ( <K_JOIN> | "," { join.setSimple(true); } (<K_OUTER> { join.setOuter(true); } )?
+           | <K_STRAIGHT> { join.setStraight(true); } )
 
         right=FromItem()
 
@@ -3239,13 +3241,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

@@ -1618,6 +1618,12 @@ public void testCastTypeProblem2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
+    @Test
+    public void testStraightJoin() throws JSQLParserException {
+        String stmt = "SELECT col FROM tbl STRAIGHT_JOIN tbl2 ON tbl.id = tbl2.id";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
     @Test
     public void testCastTypeProblem3() throws JSQLParserException {
         String stmt = "SELECT col1::varchar (256) FROM tabelle1";
@@ -1864,6 +1870,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";