From 2e669fd7a62ba8b71dd2e51b1a266f9af5a13afb Mon Sep 17 00:00:00 2001 From: dengliming Date: Tue, 24 Feb 2026 19:49:11 +0800 Subject: [PATCH] Fix oracle outer join case with nvl/coalesce --- .../java/net/sf/jsqlparser/schema/Column.java | 16 ++++++++++++++++ .../util/deparser/ExpressionDeParser.java | 3 +++ .../validator/ExpressionValidator.java | 4 ++++ .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 4 ++++ .../jsqlparser/statement/select/SelectTest.java | 13 +++++++++++++ 5 files changed, 40 insertions(+) diff --git a/src/main/java/net/sf/jsqlparser/schema/Column.java b/src/main/java/net/sf/jsqlparser/schema/Column.java index ff13ef085..1c1427c86 100644 --- a/src/main/java/net/sf/jsqlparser/schema/Column.java +++ b/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 accept(ExpressionVisitor 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; } diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java index 803c45ee9..fa2d33fba 100644 --- a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java +++ b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java @@ -832,6 +832,9 @@ public 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); diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java index 78f54ac8a..58f22724a 100644 --- a/src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java +++ b/src/main/java/net/sf/jsqlparser/util/validation/validator/ExpressionValidator.java @@ -527,6 +527,10 @@ public Void visit(ParenthesedSelect selectBody, S context) { @Override public Void visit(Column tableColumn, S context) { + if (tableColumn + .getOldOracleJoinSyntax() != SupportsOldOracleJoinSyntax.NO_ORACLE_JOIN) { + validateFeature(Feature.oracleOldJoinSyntax); + } validateName(NamedObject.column, tableColumn.getFullyQualifiedName()); return null; } diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt index c681a03f6..210bb0ce2 100644 --- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt +++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt @@ -6639,6 +6639,10 @@ Expression PrimaryExpression() #PrimaryExpression: | LOOKAHEAD(2, {!interrupted}) { retval = new AllValue(); } | LOOKAHEAD(2, {!interrupted}) retval=Column() + [ + LOOKAHEAD( "(" "+" ")" ("," | ")") ) + "(" "+" ")" { ((Column) retval).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); } + ] | LOOKAHEAD(2, {!interrupted}) (token= | token=) { retval = new BooleanValue(token.image); } diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java index 82783e822..6375210cc 100644 --- a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java +++ b/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)";