fix: use Function and SelectItem

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

Author: manticore-projects

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

@@ -2,17 +2,21 @@
 
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.Expression;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.expression.Function;
 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 PivotPipeOperator extends PipeOperator {
-    private Expression aggregateExpression;
+    private Function aggregateExpression;
     private Column inputColumn;
-    private ExpressionList<Column> pivotColumns;
+    private List<SelectItem<?>> pivotColumns;
     private Alias alias = null;
 
-    public PivotPipeOperator(Expression aggregateExpression, Column inputColumn,
-            ExpressionList<Column> pivotColumns, Alias alias) {
+    public PivotPipeOperator(Function aggregateExpression, Column inputColumn,
+            List<SelectItem<?>> pivotColumns, Alias alias) {
         this.aggregateExpression = aggregateExpression;
         this.inputColumn = inputColumn;
         this.pivotColumns = pivotColumns;
@@ -23,7 +27,7 @@ public Expression getAggregateExpression() {
         return aggregateExpression;
     }
 
-    public PivotPipeOperator setAggregateExpression(Expression aggregateExpression) {
+    public PivotPipeOperator setAggregateExpression(Function aggregateExpression) {
         this.aggregateExpression = aggregateExpression;
         return this;
     }
@@ -37,11 +41,11 @@ public PivotPipeOperator setInputColumn(Column inputColumn) {
         return this;
     }
 
-    public ExpressionList<Column> getPivotColumns() {
+    public List<SelectItem<?>> getPivotColumns() {
         return pivotColumns;
     }
 
-    public PivotPipeOperator setPivotColumns(ExpressionList<Column> pivotColumns) {
+    public PivotPipeOperator setPivotColumns(List<SelectItem<?>> pivotColumns) {
         this.pivotColumns = pivotColumns;
         return this;
     }
@@ -64,7 +68,7 @@ public StringBuilder appendTo(StringBuilder builder) {
                 .append(" FOR ")
                 .append(inputColumn)
                 .append(" IN (")
-                .append(pivotColumns)
+                .append(Select.getStringList(pivotColumns))
                 .append("))");
         if (alias != null) {
             builder.append(" ").append(alias);

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

@@ -55,6 +55,7 @@
 import net.sf.jsqlparser.statement.select.PivotVisitor;
 import net.sf.jsqlparser.statement.select.PivotXml;
 import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectItem;
 import net.sf.jsqlparser.statement.select.SelectItemVisitor;
 import net.sf.jsqlparser.statement.select.SelectVisitor;
@@ -943,7 +944,6 @@ public StringBuilder visit(OrderByPipeOperator orderBy, Void context) {
         return builder;
     }
 
-
     @Override
     public StringBuilder visit(PivotPipeOperator pivot, Void context) {
         builder
@@ -953,7 +953,7 @@ public StringBuilder visit(PivotPipeOperator pivot, Void context) {
                 .append(" FOR ")
                 .append(pivot.getInputColumn())
                 .append(" IN (")
-                .append(pivot.getPivotColumns())
+                .append(Select.getStringList(pivot.getPivotColumns()))
                 .append("))");
         if (pivot.getAlias() != null) {
             builder.append(" ").append(pivot.getAlias());

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

@@ -2612,15 +2612,15 @@ TableSamplePipeOperator TableSamplePipeOperator():
 
 PivotPipeOperator PivotPipeOperator():
 {
-    Expression aggregateExpression;
+    Function aggregateExpression;
     Column inputColumn;
-    ExpressionList<Column> pivotColumns;
+    List<SelectItem<?>> pivotColumns;
     Alias alias = null;
 }
 {
-    <K_PIVOT> "(" aggregateExpression=Expression()
+    <K_PIVOT> "(" aggregateExpression=Function()
     <K_FOR> inputColumn=Column()
-    <K_IN> "(" pivotColumns = ColumnList() ")"
+    <K_IN> "(" pivotColumns = SelectItemsList() ")"
     ")"
     [ LOOKAHEAD(2)  alias = Alias() ]
     {