Merge origin/master

wumpz · wumpz · commit 2b3faa0a5d1e · 2022-02-06T23:22:05.000+01:00
diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java
@@ -186,4 +186,6 @@ public interface ExpressionVisitor {
     void visit(AllTableColumns allTableColumns);
 
     void visit(AllValue allValue);
+
+    void visit(IsDistinctExpression isDistinctExpression);
 }
diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java
@@ -504,6 +504,11 @@ public void visit(AllTableColumns allTableColumns) {
     public void visit(AllValue allValue) {
     }
 
+    @Override
+    public void visit(IsDistinctExpression isDistinctExpression) {
+        visitBinaryExpression(isDistinctExpression);
+    }
+
     @Override
     public void visit(SelectExpressionItem selectExpressionItem) {
         selectExpressionItem.getExpression().accept(this);
diff --git a/src/main/java/net/sf/jsqlparser/expression/operators/relational/IsDistinctExpression.java b/src/main/java/net/sf/jsqlparser/expression/operators/relational/IsDistinctExpression.java
@@ -0,0 +1,42 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression.operators.relational;
+
+import net.sf.jsqlparser.expression.BinaryExpression;
+import net.sf.jsqlparser.expression.ExpressionVisitor;
+
+public class IsDistinctExpression extends BinaryExpression {
+
+    private boolean not = false;
+
+    public boolean isNot() {
+        return not;
+    }
+
+    public void setNot(boolean b) {
+        not = b;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String getStringExpression() {
+        return " IS " + (isNot() ? "NOT " : "") + "DISTINCT FROM ";
+    }
+
+    @Override
+    public String toString() {
+        String retval = getLeftExpression() + getStringExpression() + getRightExpression();
+        return retval;
+    }
+}
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SetOperationList.java b/src/main/java/net/sf/jsqlparser/statement/select/SetOperationList.java
@@ -97,8 +97,8 @@ public void setFetch(Fetch fetch) {
         this.fetch = fetch;
     }
 
-    public Fetch getWithIsolation() {
-        return fetch;
+    public WithIsolation getWithIsolation() {
+        return this.withIsolation;
     }
 
     public void setWithIsolation(WithIsolation withIsolation) {
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -576,6 +576,11 @@ public void visit(AllValue allValue) {
 
     }
 
+    @Override
+    public void visit(IsDistinctExpression isDistinctExpression) {
+        visitBinaryExpression(isDistinctExpression);
+    }
+
     @Override
     public void visit(SelectExpressionItem item) {
         item.getExpression().accept(this);
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
@@ -52,6 +52,7 @@
 import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
 import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
+import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
 import net.sf.jsqlparser.expression.operators.relational.SupportsOldOracleJoinSyntax;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
@@ -988,4 +989,11 @@ public void visit(AllTableColumns allTableColumns) {
     public void visit(AllValue allValue) {
         buffer.append(allValue);
     }
+
+    @Override
+    public void visit(IsDistinctExpression isDistinctExpression) {
+        buffer.append(isDistinctExpression.getLeftExpression() +
+                isDistinctExpression.getStringExpression() +
+                isDistinctExpression.getRightExpression());
+    }
 }
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
@@ -45,6 +45,7 @@
 import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
 import net.sf.jsqlparser.expression.operators.relational.SimilarToExpression;
+import net.sf.jsqlparser.expression.operators.relational.IsDistinctExpression;
 import net.sf.jsqlparser.expression.operators.relational.SupportsOldOracleJoinSyntax;
 import net.sf.jsqlparser.parser.feature.Feature;
 import net.sf.jsqlparser.schema.Column;
@@ -579,4 +580,10 @@ public void visit(AllValue allValue) {
 
     }
 
+    @Override
+    public void visit(IsDistinctExpression isDistinctExpression) {
+        isDistinctExpression.getLeftExpression().accept(this);
+        isDistinctExpression.getRightExpression().accept(this);
+    }
+
 }
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -1938,16 +1938,24 @@ SelectBody SetOperationList() #SetOperationList: {
                 ((PlainSelect)selects.get(0)).setUseBrackets(true);
             return selects.get(0);
         } else {
-            if (selects.size()>1 && selects.get(selects.size()-1) instanceof PlainSelect) {
+            if (selects.size()>1 && selects.get(selects.size()-1) instanceof PlainSelect && !brackets.get(brackets.size() - 1)) {
                 PlainSelect ps = (PlainSelect)selects.get(selects.size()-1);
-                if (ps.getOrderByElements() != null && !brackets.get(brackets.size() - 1)) {
+                if (ps.getOrderByElements() != null) {
                     list.setOrderByElements(ps.getOrderByElements());
                     list.setLimit(ps.getLimit());
                     list.setOffset(ps.getOffset());
                     ps.setOrderByElements(null);
                     ps.setLimit(null);
                     ps.setOffset(null);
                 }
+                if (ps.getFetch() != null) {
+                    list.setFetch(ps.getFetch());
+                    ps.setFetch(null);
+                }
+                if (ps.getWithIsolation() != null) {
+                    list.setWithIsolation(ps.getWithIsolation());
+                    ps.setWithIsolation(null);
+                }
             }
             list.setBracketsOpsAndSelects(brackets,selects,operations);
             return list;
@@ -3141,6 +3149,7 @@ Expression SQLCondition():
          | LOOKAHEAD(IsNullExpression()) result=IsNullExpression(left)
          | LOOKAHEAD(IsBooleanExpression()) result=IsBooleanExpression(left)
          | LOOKAHEAD(2) result=LikeExpression(left)
+         | LOOKAHEAD(IsDistinctExpression()) result=IsDistinctExpression(left)
          | result=SimilarToExpression(left)
         )) ]
     )
@@ -3258,6 +3267,22 @@ Expression SimilarToExpression(Expression leftExpression) #SimilarToExpression:
     }
 }
 
+Expression IsDistinctExpression(Expression leftExpression) #IsDistinctExpression:
+{
+    IsDistinctExpression result = new IsDistinctExpression();
+    Expression rightExpression = null;
+}
+{
+    <K_IS> [<K_NOT> { result.setNot(true); } ] <K_DISTINCT> <K_FROM>
+    rightExpression=SimpleExpression()
+    {
+        result.setLeftExpression(leftExpression);
+        result.setRightExpression(rightExpression);
+        linkAST(result,jjtThis);
+        return result;
+    }
+}
+
 Expression IsNullExpression(Expression leftExpression):
 {
     IsNullExpression result = new IsNullExpression();
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -898,6 +898,25 @@ public void testUnion() throws JSQLParserException {
                 + "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION "
                 + "SELECT * FROM mytable2 LIMIT 3, 4";
         assertStatementCanBeDeparsedAs(select, statementToString);
+
+        //with fetch and with ur
+        String statement2 = "SELECT * FROM mytable WHERE mytable.col = 9 UNION "
+                + "SELECT * FROM mytable3 WHERE mytable3.col = ? UNION " + "SELECT * FROM mytable2 ORDER BY COL DESC FETCH FIRST 1 ROWS ONLY WITH UR";
+
+        Select select2 = (Select) parserManager.parse(new StringReader(statement2));
+        SetOperationList setList2 = (SetOperationList) select2.getSelectBody();
+        assertEquals(3, setList2.getSelects().size());
+        assertEquals("mytable", ((Table) ((PlainSelect) setList2.getSelects().get(0)).getFromItem()).
+                getName());
+        assertEquals("mytable3", ((Table) ((PlainSelect) setList2.getSelects().get(1)).getFromItem()).
+                getName());
+        assertEquals("mytable2", ((Table) ((PlainSelect) setList2.getSelects().get(2)).getFromItem()).
+                getName());
+        assertEquals(1, ((SetOperationList) setList2).getFetch().getRowCount());
+
+        assertEquals("UR", ((SetOperationList) setList2).getWithIsolation().getIsolation());
+
+        assertStatementCanBeDeparsedAs(select2, statement2);
     }
 
     @Test
@@ -942,6 +961,18 @@ public void testDistinct() throws JSQLParserException {
         assertStatementCanBeDeparsedAs(select, statement);
     }
 
+    @Test
+    public void testIsDistinctFrom() throws JSQLParserException {
+        String stmt = "SELECT name FROM tbl WHERE name IS DISTINCT FROM foo";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
+    @Test
+    public void testIsNotDistinctFrom() throws JSQLParserException {
+        String stmt = "SELECT name FROM tbl WHERE name IS NOT DISTINCT FROM foo";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
     @Test
     public void testDistinctTop() throws JSQLParserException {
         String statement = "SELECT DISTINCT TOP 5 myid, mycol FROM mytable WHERE mytable.col = 9";

Original file line number	Diff line number	Diff line change
`@@ -186,4 +186,6 @@ public interface ExpressionVisitor {`
`186`	`186`	`void visit(AllTableColumns allTableColumns);`
`187`	`187`
`188`	`188`	`void visit(AllValue allValue);`
	`189`	`+`
	`190`	`+ void visit(IsDistinctExpression isDistinctExpression);`
`189`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ public void setFetch(Fetch fetch) {`
`97`	`97`	`this.fetch = fetch;`
`98`	`98`	`}`
`99`	`99`
`100`		`- public Fetch getWithIsolation() {`
`101`		`- return fetch;`
	`100`	`+ public WithIsolation getWithIsolation() {`
	`101`	`+ return this.withIsolation;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`public void setWithIsolation(WithIsolation withIsolation) {`