feat: CORRESPONDING modifier for SetOperator

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

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

@@ -13,38 +13,13 @@
 
 public class ExceptOp extends SetOperation {
 
-    private boolean distinct;
-    private boolean all;
-
     public ExceptOp() {
-        super(SetOperationType.EXCEPT);
-    }
-
-    public boolean isAll() {
-        return all;
-    }
-
-    public void setAll(boolean all) {
-        this.all = all;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
+        this("");
     }
 
-    @Override
-    public String toString() {
-        String allDistinct = "";
-        if (isAll()) {
-            allDistinct = " ALL";
-        } else if (isDistinct()) {
-            allDistinct = " DISTINCT";
-        }
-        return super.toString() + allDistinct;
+    public ExceptOp(String modifier) {
+        super(SetOperationType.EXCEPT);
+        this.modifier = modifier;
     }
 
     public ExceptOp withDistinct(boolean distinct) {
@@ -56,4 +31,9 @@ public ExceptOp withAll(boolean all) {
         this.setAll(all);
         return this;
     }
+
+    public ExceptOp withModifier(String modifier) {
+        this.modifier = modifier;
+        return this;
+    }
 }

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

@@ -13,37 +13,13 @@
 
 public class IntersectOp extends SetOperation {
 
-    private boolean distinct;
-    private boolean all;
-
     public IntersectOp() {
-        super(SetOperationType.INTERSECT);
-    }
-    public boolean isAll() {
-        return all;
-    }
-
-    public void setAll(boolean all) {
-        this.all = all;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
+        this("");
     }
 
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    @Override
-    public String toString() {
-        String allDistinct = "";
-        if (isAll()) {
-            allDistinct = " ALL";
-        } else if (isDistinct()) {
-            allDistinct = " DISTINCT";
-        }
-        return super.toString() + allDistinct;
+    public IntersectOp(String modifier) {
+        super(SetOperationType.INTERSECT);
+        this.modifier = modifier;
     }
 
     public IntersectOp withDistinct(boolean distinct) {
@@ -55,4 +31,9 @@ public IntersectOp withAll(boolean all) {
         this.setAll(all);
         return this;
     }
+
+    public IntersectOp withModifier(String modifier) {
+        this.modifier = modifier;
+        return this;
+    }
 }

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

@@ -12,37 +12,13 @@
 import net.sf.jsqlparser.statement.select.SetOperationList.SetOperationType;
 
 public class MinusOp extends SetOperation {
-    private boolean distinct;
-    private boolean all;
-    
     public MinusOp() {
-        super(SetOperationType.MINUS);
-    }
-    public boolean isAll() {
-        return all;
-    }
-
-    public void setAll(boolean all) {
-        this.all = all;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
+        this("");
     }
 
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    @Override
-    public String toString() {
-        String allDistinct = "";
-        if (isAll()) {
-            allDistinct = " ALL";
-        } else if (isDistinct()) {
-            allDistinct = " DISTINCT";
-        }
-        return super.toString() + allDistinct;
+    public MinusOp(String modifier) {
+        super(SetOperationType.MINUS);
+        this.modifier = modifier;
     }
 
     public MinusOp withDistinct(boolean distinct) {
@@ -54,4 +30,9 @@ public MinusOp withAll(boolean all) {
         this.setAll(all);
         return this;
     }
+
+    public MinusOp withModifier(String modifier) {
+        this.modifier = modifier;
+        return this;
+    }
 }

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

@@ -13,6 +13,23 @@
 import net.sf.jsqlparser.statement.select.SetOperationList.SetOperationType;
 
 public abstract class SetOperation extends ASTNodeAccessImpl {
+    String modifier = "";
+
+    public boolean isAll() {
+        return modifier.contains("ALL");
+    }
+
+    public void setAll(boolean all) {
+        this.modifier = "ALL";
+    }
+
+    public boolean isDistinct() {
+        return modifier.contains("DISTINCT");
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.modifier = "DISTINCT";
+    }
 
     private SetOperationType type;
 
@@ -22,6 +39,6 @@ public SetOperation(SetOperationType type) {
 
     @Override
     public String toString() {
-        return type.name();
+        return modifier == null || modifier.isEmpty() ? type.name() : type.name() + " " + modifier;
     }
 }

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

@@ -12,39 +12,13 @@
 import net.sf.jsqlparser.statement.select.SetOperationList.SetOperationType;
 
 public class UnionOp extends SetOperation {
-
-    private boolean distinct;
-    private boolean all;
-
     public UnionOp() {
-        super(SetOperationType.UNION);
-    }
-
-    public boolean isAll() {
-        return all;
-    }
-
-    public void setAll(boolean all) {
-        this.all = all;
+        this("");
     }
 
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    @Override
-    public String toString() {
-        String allDistinct = "";
-        if (isAll()) {
-            allDistinct = " ALL";
-        } else if (isDistinct()) {
-            allDistinct = " DISTINCT";
-        }
-        return super.toString() + allDistinct;
+    public UnionOp(String modifier) {
+        super(SetOperationType.UNION);
+        this.modifier = modifier;
     }
 
     public UnionOp withDistinct(boolean distinct) {
@@ -56,4 +30,9 @@ public UnionOp withAll(boolean all) {
         this.setAll(all);
         return this;
     }
+
+    public UnionOp withModifier(String modifier) {
+        this.modifier = modifier;
+        return this;
+    }
 }