Fix oracle outer join case with nvl/coalesce (#2386)

Author: dengliming

src/main/java/net/sf/jsqlparser/schema/Column.java

@@ -16,6 +16,7 @@
 import net.sf.jsqlparser.expression.ArrayConstructor;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
+import net.sf.jsqlparser.expression.operators.relational.SupportsOldOracleJoinSyntax;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
@@ -28,6 +29,7 @@ public class Column extends ASTNodeAccessImpl implements Expression, MultiPartNa
     private String commentText;
     private ArrayConstructor arrayConstructor;
     private String tableDelimiter = ".";
+    private int oldOracleJoinSyntax = SupportsOldOracleJoinSyntax.NO_ORACLE_JOIN;
 
     // holds the physical table when resolved against an actual schema information
     private Table resolvedTable = null;
@@ -192,6 +194,14 @@ public void setTableDelimiter(String tableDelimiter) {
         this.tableDelimiter = tableDelimiter;
     }
 
+    public int getOldOracleJoinSyntax() {
+        return oldOracleJoinSyntax;
+    }
+
+    public void setOldOracleJoinSyntax(int oldOracleJoinSyntax) {
+        this.oldOracleJoinSyntax = oldOracleJoinSyntax;
+    }
+
     @Override
     public String getFullyQualifiedName() {
         return getFullyQualifiedName(false);
@@ -245,6 +255,7 @@ public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
     @Override
     public String toString() {
         return getFullyQualifiedName(true)
+                + (oldOracleJoinSyntax != SupportsOldOracleJoinSyntax.NO_ORACLE_JOIN ? "(+)" : "")
                 + (commentText != null ? " /* " + commentText + "*/ " : "");
     }
 
@@ -268,6 +279,11 @@ public Column withTableDelimiter(String delimiter) {
         return this;
     }
 
+    public Column withOldOracleJoinSyntax(int oldOracleJoinSyntax) {
+        this.setOldOracleJoinSyntax(oldOracleJoinSyntax);
+        return this;
+    }
+
     public String getCommentText() {
         return commentText;
     }

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

@@ -832,6 +832,9 @@ public <S> StringBuilder visit(Column tableColumn, S context) {
         }
 
         builder.append(tableColumn.getColumnName());
+        if (tableColumn.getOldOracleJoinSyntax() != SupportsOldOracleJoinSyntax.NO_ORACLE_JOIN) {
+            builder.append("(+)");
+        }
 
         if (tableColumn.getArrayConstructor() != null) {
             tableColumn.getArrayConstructor().accept(this, context);

src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java

@@ -527,6 +527,10 @@ public <S> Void visit(ParenthesedSelect selectBody, S context) {
 
     @Override
     public <S> Void visit(Column tableColumn, S context) {
+        if (tableColumn
+                .getOldOracleJoinSyntax() != SupportsOldOracleJoinSyntax.NO_ORACLE_JOIN) {
+            validateFeature(Feature.oracleOldJoinSyntax);
+        }
         validateName(NamedObject.column, tableColumn.getFullyQualifiedName());
         return null;
     }

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

@@ -6639,6 +6639,10 @@ Expression PrimaryExpression() #PrimaryExpression:
         | LOOKAHEAD(2, {!interrupted}) <K_ALL> { retval = new AllValue(); }
 
         | LOOKAHEAD(2, {!interrupted}) retval=Column()
+            [
+                LOOKAHEAD( "(" "+" ")" ("," | ")") )
+                "(" "+" ")" { ((Column) retval).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); }
+            ]
 
         | LOOKAHEAD(2, {!interrupted}) (token=<K_TRUE> | token=<K_FALSE>) { retval = new BooleanValue(token.image); }
 

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

@@ -2379,6 +2379,19 @@ public void testOracleJoinIssue318() throws JSQLParserException {
                 "SELECT * FROM TBL_A, TBL_B, TBL_C WHERE TBL_A.ID(+) = TBL_B.ID AND TBL_C.ROOM(+) = TBL_B.ROOM");
     }
 
+    @Test
+    public void testOracleJoinWithinNvlArgument() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT * FROM dual d, dual d2 WHERE d.dummy = nvl(d2.dummy (+), 'y')", true);
+    }
+
+    @Test
+    public void testOracleJoinWithinCoalesceArgument() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT * FROM dual d, dual d2 WHERE d.dummy = coalesce(d2.dummy (+), 'y')",
+                true);
+    }
+
     @Test
     public void testProblemSqlIntersect() throws Exception {
         String stmt = "(SELECT * FROM a) INTERSECT (SELECT * FROM b)";