Add support for oracle UnPivot when use multi columns at once. (#1419)

Co-authored-by: LeiJun <[email protected]>

Author: AkkaXdXd

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

@@ -18,7 +18,7 @@ public class UnPivot {
 
     private boolean includeNulls = false;
     private boolean includeNullsSpecified = false;
-    private Column unpivotClause;
+    private List<Column> unpivotClause;
     private List<Column> unpivotForClause;
     private List<SelectExpressionItem> unpivotInClause;
     private Alias alias;
@@ -40,11 +40,11 @@ public boolean getIncludeNullsSpecified() {
         return includeNullsSpecified;
     }
 
-    public Column getUnPivotClause() {
+    public List<Column> getUnPivotClause() {
         return unpivotClause;
     }
 
-    public void setUnPivotClause(Column unpivotClause) {
+    public void setUnPivotClause(List<Column> unpivotClause) {
         this.unpivotClause = unpivotClause;
     }
 
@@ -69,7 +69,7 @@ public String toString() {
         return "UNPIVOT"
                 + (includeNullsSpecified && includeNulls ? " INCLUDE NULLS" : "")
                 + (includeNullsSpecified && !includeNulls ? " EXCLUDE NULLS" : "")
-                + " (" + unpivotClause
+                + " (" + PlainSelect.getStringList(unpivotClause, true, unpivotClause != null && unpivotClause.size() > 1)
                 + " FOR " + PlainSelect.getStringList(unpivotForClause, true, unpivotForClause != null && unpivotForClause.size() > 1)
                 + " IN " + PlainSelect.getStringList(unpivotInClause, true, true) + ")"
                 + (alias!=null ? alias.toString() : "");

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

@@ -306,12 +306,14 @@ public void visit(Pivot pivot) {
     public void visit(UnPivot unpivot) {
         boolean showOptions = unpivot.getIncludeNullsSpecified();
         boolean includeNulls = unpivot.getIncludeNulls();
+        List<Column> unPivotClause = unpivot.getUnPivotClause();
         List<Column> unpivotForClause = unpivot.getUnPivotForClause();
         buffer
                 .append(" UNPIVOT")
                 .append(showOptions && includeNulls ? " INCLUDE NULLS" : "")
                 .append(showOptions && !includeNulls ? " EXCLUDE NULLS" : "")
-                .append(" (").append(unpivot.getUnPivotClause())
+                .append(" (").append(PlainSelect.getStringList(unPivotClause, true,
+                        unPivotClause != null && unPivotClause.size() > 1))
                 .append(" FOR ").append(PlainSelect.getStringList(unpivotForClause, true,
                         unpivotForClause != null && unpivotForClause.size() > 1))
                 .append(" IN ").append(PlainSelect.getStringList(unpivot.getUnPivotInClause(), true, true)).append(")");

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

@@ -175,7 +175,7 @@ public void visit(UnPivot unpivot) {
         validateFeature(Feature.unpivot);
 
         validateOptionalExpressions(unpivot.getUnPivotForClause());
-        validateOptionalExpression(unpivot.getUnPivotClause());
+        validateOptionalExpressions(unpivot.getUnPivotClause());
     }
 
     @Override

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

@@ -2294,7 +2294,7 @@ PivotXml PivotXml():
 UnPivot UnPivot():
 {
     UnPivot retval = new UnPivot();
-    Column unpivotClause;
+    List<Column> unpivotClause;
     List<Column> unpivotForClause;
     List<SelectExpressionItem> unpivotInClause;
     Alias alias = null;
@@ -2303,7 +2303,7 @@ UnPivot UnPivot():
     <K_UNPIVOT>
     [ ( <K_INCLUDE> <K_NULLS> { retval.setIncludeNulls(true); }
     | <K_EXCLUDE> <K_NULLS> { retval.setIncludeNulls(false); } ) ]
-    "(" unpivotClause = Column() <K_FOR>
+    "(" unpivotClause = PivotForColumns() <K_FOR>
     unpivotForClause = PivotForColumns()
     <K_IN> "("
     unpivotInClause = PivotSingleInItems()

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

@@ -2568,6 +2568,15 @@ public void testUnPivot() throws JSQLParserException {
        assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
+    @Test
+    public void testUnPivotWithMultiColumn() throws JSQLParserException {
+        String stmt = "SELECT * FROM sale_stats" +
+                " UNPIVOT (" +
+                "(quantity, rank)" +
+                " FOR product_code IN ((product_a, product_1) AS 'A', (product_b, product_2) AS 'B', (product_c, product_3) AS 'C'))";
+        assertSqlCanBeParsedAndDeparsed(stmt);
+    }
+
     @Test
     public void testPivotWithAlias() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * FROM (SELECT * FROM mytable LEFT JOIN mytable2 ON Factor_ID = Id) f PIVOT (max(f.value) FOR f.factoryCode IN (ZD, COD, SW, PH))");