Merge origin/master

Author: wumpz

README.md

@@ -133,7 +133,7 @@ And this is the dependency declaration in your pom:
 <dependency>
 	<groupId>com.github.jsqlparser</groupId>
 	<artifactId>jsqlparser</artifactId>
-	<version>3.0</version>
+	<version>3.1</version>
 </dependency>
 ```
 

src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java

@@ -40,6 +40,20 @@ public static Statement parse(String sql) throws JSQLParserException {
         return parse(sql, null);
     }
 
+    /**
+     * Parses an sql statement while allowing via consumer to configure the used parser before.
+     * 
+     * For instance to activate SQLServer bracket quotation on could use:
+     * 
+     * {@code 
+     * CCJSqlParserUtil.parse("select * from [mytable]", parser -> parser.withSquareBracketQuotation(true));
+     * }
+     * 
+     * @param sql
+     * @param consumer
+     * @return
+     * @throws JSQLParserException 
+     */
     public static Statement parse(String sql, Consumer<CCJSqlParser> consumer) throws JSQLParserException {
         CCJSqlParser parser = new CCJSqlParser(new StringProvider(sql));
         if (consumer != null) {

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;
@@ -48,6 +49,7 @@ public class PlainSelect extends ASTNodeAccessImpl implements SelectBody {
     private boolean sqlNoCacheFlag = false;
     private String forXmlPath;
     private KSQLWindow ksqlWindow = null;
+    private boolean noWait = false;
 
     public boolean isUseBrackets() {
         return useBrackets;
@@ -170,6 +172,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 +307,10 @@ public String toString() {
         }
         sql.append("SELECT ");
 
+        if (this.mySqlHintStraightJoin) {
+            sql.append("STRAIGHT_JOIN ");
+        }
+
         if (oracleHint != null) {
             sql.append(oracleHint).append(" ");
         }
@@ -383,6 +397,10 @@ public String toString() {
                     // Wait's toString will do the formatting for us
                     sql.append(wait);
                 }
+
+                if (isNoWait()) {
+                    sql.append(" NOWAIT");
+                }
             }
             if (optimizeFor != null) {
                 sql.append(optimizeFor);
@@ -493,4 +511,12 @@ public boolean getMySqlSqlCalcFoundRows() {
     public boolean getMySqlSqlNoCache() {
         return this.sqlNoCacheFlag;
     }
+
+    public void setNoWait(boolean noWait) {
+        this.noWait = noWait;
+    }
+
+    public boolean isNoWait() {
+        return this.noWait;
+    }
 }

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(" ");
@@ -161,6 +165,9 @@ public void visit(PlainSelect plainSelect) {
                 // wait's toString will do the formatting for us
                 buffer.append(plainSelect.getWait());
             }
+            if (plainSelect.isNoWait()) {
+                buffer.append(" NOWAIT");
+            }
         }
         if (plainSelect.getOptimizeFor() != null) {
             deparseOptimizeFor(plainSelect.getOptimizeFor());

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

@@ -233,6 +233,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_NOVALIDATE : "NOVALIDATE">
 |   <K_NULL:"NULL">
 |   <K_NULLS: "NULLS">
+|   <K_NOWAIT: "NOWAIT">
 |   <K_OF:"OF">
 |   <K_OFFSET:"OFFSET">
 |   <K_ON:"ON">
@@ -1276,11 +1277,14 @@ PlainSelect PlainSelect() #PlainSelect:
     Wait wait = null;
     boolean mySqlSqlCalcFoundRows = false;
     Token token;
-    KSQLWindow ksqlWindow=null;
+    KSQLWindow ksqlWindow = null;
+    boolean noWait = false;
 }
 {
     <K_SELECT>
 
+    [ <K_STRAIGHT> { plainSelect.setMySqlHintStraightJoin(true); } ]
+
     { plainSelect.setOracleHint(getOracleHint()); }
 
     [skip = Skip() { plainSelect.setSkip(skip);    } ]
@@ -1330,9 +1334,10 @@ PlainSelect PlainSelect() #PlainSelect:
 
     [LOOKAHEAD(<K_FETCH>) fetch = Fetch() { plainSelect.setFetch(fetch);    } ]
 
-    [ LOOKAHEAD(2) <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); }
+    [LOOKAHEAD(2) <K_FOR> <K_UPDATE> { plainSelect.setForUpdate(true); }
         [ <K_OF> updateTable = Table() { plainSelect.setForUpdateTable(updateTable); } ]
-        [ LOOKAHEAD(<K_WAIT>) wait = Wait() { plainSelect.setWait(wait); } ] ]
+        [ LOOKAHEAD(<K_WAIT>) wait = Wait() { plainSelect.setWait(wait); } ]
+        [ <K_NOWAIT> { plainSelect.setNoWait(true); } ] ]
 
     [LOOKAHEAD(<K_OPTIMIZE>) optimize = OptimizeFor() { plainSelect.setOptimizeFor(optimize); } ]
 
@@ -3860,7 +3865,8 @@ ColDataType ColDataType():
 		| ( tk=<S_IDENTIFIER> | tk=<K_DATETIMELITERAL> | tk=<K_DATE_LITERAL> | tk=<K_XML> | tk=<K_INTERVAL> | tk=<DT_ZONE> | tk=<K_CHAR> | tk=<K_SET> )  
 				{ colDataType.setDataType(tk.image); }
 		| tk=<K_UNSIGNED> tk2=<S_IDENTIFIER> {colDataType.setDataType(tk.image + " " + tk2.image);}
-		| tk=<K_SIGNED> tk2=<S_IDENTIFIER> {colDataType.setDataType(tk.image + " " + tk2.image);}
+		| LOOKAHEAD(2) tk=<K_SIGNED> tk2=<S_IDENTIFIER> {colDataType.setDataType(tk.image + " " + tk2.image);}
+		| tk=<K_SIGNED> { colDataType.setDataType(tk.image);}
 	)
 
     [LOOKAHEAD(2) "(" {tk2 =null;} ( (tk=<S_LONG> [ tk2=<K_BYTE> | tk2=<K_CHAR> ] | tk=<S_CHAR_LITERAL> | tk=<S_IDENTIFIER> ) 

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

@@ -1638,11 +1638,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";
@@ -2939,6 +2945,11 @@ public void testCastToSignedInteger() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT CAST(contact_id AS SIGNED INTEGER) FROM contact WHERE contact_id = 20");
     }
 
+    @Test
+    public void testCastToSigned() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT CAST(contact_id AS SIGNED) FROM contact WHERE contact_id = 20");
+    }
+
 //    @Test
 //    public void testWhereIssue240_notBoolean() {
 //        try {
@@ -3131,6 +3142,11 @@ public void testForUpdateWaitWithTimeout() throws JSQLParserException {
         assertEquals("wait time should be 60", waitTime, 60L);
     }
 
+    @Test
+    public void testForUpdateNoWait() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable FOR UPDATE NOWAIT");
+    }
+
 //    @Test public void testSubSelectFailsIssue394() throws JSQLParserException {
 //        assertSqlCanBeParsedAndDeparsed("select aa.* , t.* from accenter.all aa, (select a.* from pacioli.emc_plan a) t");
 //    }