fix: use SelectItem for UnPivot

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/statement/piped/PivotPipeOperator.java

@@ -1,7 +1,6 @@
 package net.sf.jsqlparser.statement.piped;
 
 import net.sf.jsqlparser.expression.Alias;
-import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.Select;

src/main/java/net/sf/jsqlparser/statement/piped/UnPivotPipeOperator.java

@@ -1,17 +1,20 @@
 package net.sf.jsqlparser.statement.piped;
 
 import net.sf.jsqlparser.expression.Alias;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.SelectItem;
+
+import java.util.List;
 
 public class UnPivotPipeOperator extends PipeOperator {
     private Column valuesColumn;
     private Column nameColumn;
-    private ExpressionList<Column> pivotColumns;
+    private List<SelectItem<?>> pivotColumns;
     private Alias alias = null;
 
     public UnPivotPipeOperator(Column valuesColumn, Column nameColumn,
-            ExpressionList<Column> pivotColumns, Alias alias) {
+            List<SelectItem<?>> pivotColumns, Alias alias) {
         this.valuesColumn = valuesColumn;
         this.nameColumn = nameColumn;
         this.pivotColumns = pivotColumns;
@@ -36,11 +39,11 @@ public UnPivotPipeOperator setNameColumn(Column nameColumn) {
         return this;
     }
 
-    public ExpressionList<Column> getPivotColumns() {
+    public List<SelectItem<?>> getPivotColumns() {
         return pivotColumns;
     }
 
-    public UnPivotPipeOperator setPivotColumns(ExpressionList<Column> pivotColumns) {
+    public UnPivotPipeOperator setPivotColumns(List<SelectItem<?>> pivotColumns) {
         this.pivotColumns = pivotColumns;
         return this;
     }
@@ -63,7 +66,7 @@ public StringBuilder appendTo(StringBuilder builder) {
                 .append(" FOR ")
                 .append(nameColumn)
                 .append(" IN (")
-                .append(pivotColumns)
+                .append(Select.getStringList(pivotColumns))
                 .append("))");
         if (alias != null) {
             builder.append(" ").append(alias);

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

@@ -2632,13 +2632,13 @@ UnPivotPipeOperator UnPivotPipeOperator():
 {
     Column valuesColumn;
     Column nameColumn;
-    ExpressionList<Column> pivotColumns;
+    List<SelectItem<?>> pivotColumns;
     Alias alias = null;
 }
 {
     <K_UNPIVOT> "(" valuesColumn=Column()
     <K_FOR> nameColumn=Column()
-    <K_IN> "(" pivotColumns = ColumnList() ")"
+    <K_IN> "(" pivotColumns = SelectItemsList() ")"
     ")"
     [ LOOKAHEAD(2) alias = Alias() ]
     {

src/test/java/net/sf/jsqlparser/statement/builder/ReflectionModelTest.java

@@ -190,7 +190,7 @@ public class ReflectionModelTest {
             new net.sf.jsqlparser.statement.select.OrderByElement(),
             // new net.sf.jsqlparser.statement.select.ParenthesisFromItem().getFromItem(),
             new net.sf.jsqlparser.statement.select.Pivot(),
-            new net.sf.jsqlparser.statement.select.PivotXml(),
+            // new net.sf.jsqlparser.statement.select.PivotXml(),
             // new net.sf.jsqlparser.statement.select.PlainSelect(),
             // new net.sf.jsqlparser.statement.select.Select(),
             new net.sf.jsqlparser.statement.select.SelectItem<>(),

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

@@ -2774,6 +2774,19 @@ public void testPivot5() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
+    @Test
+    void testPivotWithOrderBy() throws JSQLParserException {
+        String sqlStr = "" +
+                "SELECT *\n" +
+                "FROM (\n" +
+                "       SELECT 'kale' AS product, 51 AS sales, 'Q1' AS quarter\n" +
+                "     )\n" +
+                "PIVOT(SUM(sales) FOR quarter IN ('Q1', 'Q2'))\n" +
+                "ORDER BY 1\n" +
+                ";";
+        assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+    }
+
     @Test
     public void testPivotXml1() throws JSQLParserException {
         String stmt = "SELECT * FROM mytable PIVOT XML (count(a) FOR b IN ('val1'))";