Adding support for STRAIGHT_JOIN in the select clause (#861)

* Adding support for straight_join in the select clause

* Renaming the field name to reflect that this is a MySQL hint

Author: tomershay

src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java

@@ -35,6 +35,7 @@ public class PlainSelect extends ASTNodeAccessImpl implements SelectBody {
     private Fetch fetch;
     private OptimizeFor optimizeFor;
     private Skip skip;
+    private boolean mySqlHintStraightJoin;
     private First first;
     private Top top;
     private OracleHierarchicalExpression oracleHierarchical = null;
@@ -170,6 +171,14 @@ public void setSkip(Skip skip) {
         this.skip = skip;
     }
 
+    public boolean getMySqlHintStraightJoin() {
+        return this.mySqlHintStraightJoin;
+    }
+
+    public void setMySqlHintStraightJoin(boolean mySqlHintStraightJoin) {
+        this.mySqlHintStraightJoin = mySqlHintStraightJoin;
+    }
+
     public First getFirst() {
         return first;
     }
@@ -297,6 +306,10 @@ public String toString() {
         }
         sql.append("SELECT ");
 
+        if (this.mySqlHintStraightJoin) {
+            sql.append("STRAIGHT_JOIN ");
+        }
+
         if (oracleHint != null) {
             sql.append(oracleHint).append(" ");
         }

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

@@ -36,6 +36,10 @@ public void visit(PlainSelect plainSelect) {
         }
         buffer.append("SELECT ");
 
+        if (plainSelect.getMySqlHintStraightJoin()) {
+            buffer.append("STRAIGHT_JOIN ");
+        }
+
         OracleHint hint = plainSelect.getOracleHint();
         if (hint != null) {
             buffer.append(hint).append(" ");

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

@@ -1281,6 +1281,8 @@ PlainSelect PlainSelect() #PlainSelect:
 {
     <K_SELECT>
 
+    [ <K_STRAIGHT> { plainSelect.setMySqlHintStraightJoin(true); } ]
+
     { plainSelect.setOracleHint(getOracleHint()); }
 
     [skip = Skip() { plainSelect.setSkip(skip);    } ]

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

@@ -1637,11 +1637,17 @@ public void testCastTypeProblem2() throws JSQLParserException {
     }
 
     @Test
-    public void testStraightJoin() throws JSQLParserException {
+    public void testMySQLHintStraightJoin() throws JSQLParserException {
         String stmt = "SELECT col FROM tbl STRAIGHT_JOIN tbl2 ON tbl.id = tbl2.id";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
+    @Test
+    public void testStraightJoinInSelect() throws JSQLParserException {
+        String stmt = "SELECT STRAIGHT_JOIN col, col2 FROM tbl INNER JOIN tbl2 ON tbl.id = tbl2.id";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
     @Test
     public void testCastTypeProblem3() throws JSQLParserException {
         String stmt = "SELECT col1::varchar (256) FROM tabelle1";