Merge origin/master

Author: wumpz

README.md

@@ -67,6 +67,7 @@ Additionally, we have fixed many errors and improved the code quality and the te
 * Add support for `... ALTER COLUMN ... DROP DEFAULT`
 * `INSERT` supports `SetOperations` (e. g. `INSERT INTO ... SELECT ... FROM ... UNION SELECT ... FROM ...`), those `SetOperations` are used both for `SELECT` and `VALUES` clauses (API change) in order to simplify the Grammar
 * `(WITH ... SELECT ...)` statements within brackets are now supported
+* Postgres `NATURAL { INNER | LEFT | RIGHT } JOIN` support
 
 
 ## Building from the sources

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

@@ -304,10 +304,12 @@ public String toString() {
         } else if (isSimple()) {
             builder.append(rightItem);
         } else {
+            if (isNatural()) {
+                builder.append("NATURAL ");
+            }
+
             if (isRight()) {
                 builder.append("RIGHT ");
-            } else if (isNatural()) {
-                builder.append("NATURAL ");
             } else if (isFull()) {
                 builder.append("FULL ");
             } else if (isLeft()) {

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

@@ -401,10 +401,12 @@ public void deparseJoin(Join join) {
             buffer.append(", ");
         } else {
 
+            if (join.isNatural()) {
+                buffer.append(" NATURAL");
+            }
+
             if (join.isRight()) {
                 buffer.append(" RIGHT");
-            } else if (join.isNatural()) {
-                buffer.append(" NATURAL");
             } else if (join.isFull()) {
                 buffer.append(" FULL");
             } else if (join.isLeft()) {

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

@@ -2579,24 +2579,37 @@ Join JoinerExpression() #JoinerExpression:
 
 }
 {
-
+    [ <K_NATURAL> { join.setNatural(true); } ]
 
     [
-          <K_LEFT> { join.setLeft(true); } [ <K_SEMI> { join.setSemi(true); } | <K_OUTER> { join.setOuter(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_OUTER> { join.setOuter(true); }
+        (
+            <K_LEFT> { join.setLeft(true); } [ <K_SEMI> { join.setSemi(true); } | <K_OUTER> { join.setOuter(true); } ]
+            |
+            (
+                <K_RIGHT> { join.setRight(true); }
+                |
+                <K_FULL> { join.setFull(true); }
+            ) [ <K_OUTER> { join.setOuter(true); } ]
+            |
+            <K_INNER> { join.setInner(true); }
+        )
+        |
+        <K_CROSS> { join.setCross(true); }
+        |
+        <K_OUTER> { join.setOuter(true); }
     ]
 
-          ( <K_JOIN> | "," { join.setSimple(true); } (<K_OUTER> { join.setOuter(true); } )?
-           | <K_STRAIGHT> { join.setStraight(true); } | <K_APPLY> {join.setApply(true); } )
-
-        right=FromItem()
+    (
+        <K_JOIN>
+        |
+        "," { join.setSimple(true); } (<K_OUTER> { join.setOuter(true); } )?
+        |
+        <K_STRAIGHT> { join.setStraight(true); }
+        |
+        <K_APPLY> {join.setApply(true); }
+    )
 
+    right=FromItem()
 
     [
         LOOKAHEAD(2) (

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

@@ -5213,4 +5213,17 @@ public void testLoclTimezone1471() throws JSQLParserException {
     public void testMissingLimitIssue1505() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("(SELECT * FROM mytable) LIMIT 1");
     }
+
+    @Test
+    public void testPostgresNaturalJoinIssue1559() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT t1.ID,t1.name, t2.DID, t2.name\n" +
+                "FROM table1 as t1\n" +
+                "NATURAL RIGHT JOIN table2 as t2", true);
+
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT t1.ID,t1.name, t2.DID, t2.name\n" +
+                        "FROM table1 as t1\n" +
+                        "NATURAL RIGHT JOIN table2 as t2", true);
+    }
 }