replaced column list in expression list for partition by of analytic expressions

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java

@@ -25,6 +25,8 @@
 import net.sf.jsqlparser.statement.select.OrderByElement;
 
 import java.util.List;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.statement.select.PlainSelect;
 
 /**
  * Analytic function. The name of the function is variable but the parameters
@@ -36,7 +38,8 @@
  */
 public class AnalyticExpression implements Expression {
 
-	private List<Column> partitionByColumns;
+	//private List<Column> partitionByColumns;
+    private ExpressionList partitionExpressionList;
 	private List<OrderByElement> orderByElements;
 	private String name;
 	private Expression expression;
@@ -58,13 +61,23 @@ public void setOrderByElements(List<OrderByElement> orderByElements) {
 		this.orderByElements = orderByElements;
 	}
 
-	public List<Column> getPartitionByColumns() {
-		return partitionByColumns;
-	}
+//	public List<Column> getPartitionByColumns() {
+//		return partitionByColumns;
+//	}
+//
+//	public void setPartitionByColumns(List<Column> partitionByColumns) {
+//		this.partitionByColumns = partitionByColumns;
+//	}
 
-	public void setPartitionByColumns(List<Column> partitionByColumns) {
-		this.partitionByColumns = partitionByColumns;
-	}
+    public ExpressionList getPartitionExpressionList() {
+        return partitionExpressionList;
+    }
+
+    public void setPartitionExpressionList(ExpressionList partitionExpressionList) {
+        this.partitionExpressionList = partitionExpressionList;
+    }
+    
+    
 
 	public String getName() {
 		return name;
@@ -141,14 +154,9 @@ public void setAllColumns(boolean allColumns) {
 	}
 
 	private void toStringPartitionBy(StringBuilder b) {
-		if (partitionByColumns != null && !partitionByColumns.isEmpty()) {
+		if (partitionExpressionList != null && !partitionExpressionList.getExpressions().isEmpty()) {
 			b.append("PARTITION BY ");
-			for (int i = 0; i < partitionByColumns.size(); i++) {
-				if (i > 0) {
-					b.append(", ");
-				}
-				b.append(partitionByColumns.get(i).toString());
-			}
+			b.append(PlainSelect.getStringList(partitionExpressionList.getExpressions(), true, false));
 			b.append(" ");
 		}
 	}

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -1743,10 +1743,9 @@ IntervalExpression IntervalExpression() : {
 AnalyticExpression AnalyticExpression() :
 {
 	AnalyticExpression retval = new AnalyticExpression();
-	List<Column> plist = new ArrayList<Column>();
+	ExpressionList expressionList = null;
 	List<OrderByElement> olist = null;
 	Token token = null;
-	Column column = null;
 	Expression expr = null;
 	Expression offset = null;
 	Expression defaultValue = null;
@@ -1755,14 +1754,14 @@ AnalyticExpression AnalyticExpression() :
 {
 	token=<S_IDENTIFIER> { retval.setName(token.image); }
 	    "(" [ expr=SimpleExpression() ["," offset=SimpleExpression() ["," defaultValue=SimpleExpression() ]] | "*" { retval.setAllColumns(true); } ] ")" <K_OVER> "("
-        [<K_PARTITION> <K_BY> column=Column() {plist.add(column);}  ("," column=Column() {plist.add(column);} )* ]
+        [<K_PARTITION> <K_BY> expressionList=SimpleExpressionList() ]
         [olist=OrderByElements() [windowElement = WindowElement() ] ]
 
 	{
 		retval.setExpression(expr);
 		retval.setOffset(offset);
 		retval.setDefaultValue(defaultValue);
-		retval.setPartitionByColumns(plist);
+		retval.setPartitionExpressionList(expressionList);
 		retval.setOrderByElements(olist);
         retval.setWindowElement(windowElement);
 	}

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

@@ -1037,6 +1037,16 @@ public void testAnalyticFunction18() throws JSQLParserException {
         String statement = "SELECT AVG(sal) OVER (PARTITION BY deptno ORDER BY sal RANGE CURRENT ROW) AS avg_of_current_sal FROM emp";
         assertSqlCanBeParsedAndDeparsed(statement);
     }
+    
+    public void testAnalyticFunctionProblem1() throws JSQLParserException {
+        String statement = "SELECT last_value(s.revenue_hold) OVER (PARTITION BY s.id_d_insertion_order, s.id_d_product_ad_attr, trunc(s.date_id, 'mm') ORDER BY s.date_id) AS col FROM s";
+        assertSqlCanBeParsedAndDeparsed(statement);
+    }
+    
+    public void testAnalyticFunctionProblem1b() throws JSQLParserException {
+        String statement = "SELECT last_value(s.revenue_hold) OVER (PARTITION BY s.id_d_insertion_order, s.id_d_product_ad_attr, trunc(s.date_id, 'mm') ORDER BY s.date_id ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS col FROM s";
+        assertSqlCanBeParsedAndDeparsed(statement);
+    }
 
     public void testOracleJoin() throws JSQLParserException {
         String stmt = "SELECT * FROM tabelle1, tabelle2 WHERE tabelle1.a = tabelle2.b(+)";