refactored join processor to be more restrictive

Author: wumpz

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -1005,7 +1005,7 @@ Join JoinerExpression():
 			cross join
 			natural join
      */
-	  [ (
+	  /* [ (
 	  	<K_LEFT> { join.setLeft(true); }
   		| <K_RIGHT> { join.setRight(true); }
   		| <K_FULL> { join.setFull(true); }
@@ -1019,7 +1019,14 @@ Join JoinerExpression():
   		<K_OUTER> { join.setOuter(true); }
   		| <K_INNER> { join.setInner(true); }
   		)
-  	   ]
+  	   ] */
+
+       [ ( <K_LEFT> { join.setLeft(true); }
+  		| <K_RIGHT> { join.setRight(true); }
+  		| <K_FULL> { join.setFull(true); } ) [ <K_OUTER> { join.setOuter(true); } ]
+        | <K_INNER> { join.setInner(true); }
+        | <K_NATURAL> { join.setNatural(true); }
+		| <K_CROSS> { join.setCross(true); } ]
 
   	    ( <K_JOIN> | "," { join.setSimple(true); } ) right=FromItem()
 	[

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

@@ -473,7 +473,7 @@ public void testJoin() throws JSQLParserException {
         statement = "SELECT * FROM tab1 RIGHT OUTER JOIN tab2 USING (id, id2)";
         assertSqlCanBeParsedAndDeparsed(statement);
 
-        statement = "SELECT * FROM foo AS f LEFT INNER JOIN (bar AS b RIGHT OUTER JOIN baz AS z ON f.id = z.id) ON f.id = b.id";
+        statement = "SELECT * FROM foo AS f LEFT OUTER JOIN (bar AS b RIGHT OUTER JOIN baz AS z ON f.id = z.id) ON f.id = b.id";
         select = (Select) parserManager.parse(new StringReader(statement));
         assertStatementCanBeDeparsedAs(select, statement);