analytic expressions updated

Author: wumpz

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

@@ -1,37 +1,41 @@
 package net.sf.jsqlparser.expression;
 
 import java.util.List;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.select.OrderByElement;
 
 /**
  * Analytic function. The name of the function is variable but the parameters
- * following the special analytic function path.
- * e.g. row_number() over (order by test)
+ * following the special analytic function path. e.g. row_number() over (order
+ * by test)
+ *
  * @author tw
  */
 public class AnalyticExpression implements Expression {
 
-	private List partitionByColumns;
-	private List orderByElements;
+	private List<Column> partitionByColumns;
+	private List<OrderByElement> orderByElements;
 	private String name;
-	
+	private Expression expression;
+
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
-	public List getOrderByElements() {
+	public List<OrderByElement> getOrderByElements() {
 		return orderByElements;
 	}
 
-	public void setOrderByElements(List orderByElements) {
+	public void setOrderByElements(List<OrderByElement> orderByElements) {
 		this.orderByElements = orderByElements;
 	}
 
-	public List getPartitionByColumns() {
+	public List<Column> getPartitionByColumns() {
 		return partitionByColumns;
 	}
 
-	public void setPartitionByColumns(List partitionByColumns) {
+	public void setPartitionByColumns(List<Column> partitionByColumns) {
 		this.partitionByColumns = partitionByColumns;
 	}
 
@@ -42,35 +46,47 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
+	public Expression getExpression() {
+		return expression;
+	}
+
+	public void setExpression(Expression expression) {
+		this.expression = expression;
+	}
+
 	@Override
 	public String toString() {
 		StringBuilder b = new StringBuilder();
-		
-		b.append(name).append("() OVER (");
-		if (partitionByColumns!=null && !partitionByColumns.isEmpty()) {
+
+		b.append(name).append("(");
+		if (expression != null) {
+			b.append(expression.toString());
+		}
+		b.append(") OVER (");
+		if (partitionByColumns != null && !partitionByColumns.isEmpty()) {
 			b.append("PARTITION BY ");
-			for (int i=0;i<partitionByColumns.size();i++) {
-				if (i>0) {
+			for (int i = 0; i < partitionByColumns.size(); i++) {
+				if (i > 0) {
 					b.append(", ");
 				}
 				b.append(partitionByColumns.get(i).toString());
 			}
 			b.append(" ");
 		}
-		
-		if (orderByElements!=null && !orderByElements.isEmpty()) {
+
+		if (orderByElements != null && !orderByElements.isEmpty()) {
 			b.append("ORDER BY ");
-			for (int i=0;i<orderByElements.size();i++) {
-				if (i>0) {
+			for (int i = 0; i < orderByElements.size(); i++) {
+				if (i > 0) {
 					b.append(", ");
 				}
 				b.append(orderByElements.get(i).toString());
 			}
 		}
-		
-        b.append(")");
-		
+
+		b.append(")");
+
 		return b.toString();
-    }
+	}
 }

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

@@ -1566,10 +1566,14 @@ AnalyticExpression AnalyticExpression() :
 	List<OrderByElement> olist = null;
 	Token token = null;
 	Column column = null;
+	Expression expr = null;
 }
 {
-	token=<S_IDENTIFIER> { retval.setName(token.image); } "(" ")" <K_OVER> "(" [<K_PARTITION> <K_BY> (column=Column() {plist.add(column);} )+ ] olist=OrderByElements() 
+	token=<S_IDENTIFIER> { retval.setName(token.image); } "(" [ expr=SimpleExpression() ] ")" <K_OVER> "(" 
+        [<K_PARTITION> <K_BY> (column=Column() {plist.add(column);} )+ ] 
+        [olist=OrderByElements() ]
 	{
+		retval.setExpression(expr);
 		retval.setPartitionByColumns(plist);
 		retval.setOrderByElements(olist);
 	} 

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

@@ -656,6 +656,11 @@ public void testProblemSqlAnalytic5AggregateColumnValue() throws JSQLParserExcep
 		String stmt = "SELECT a, sum(b) OVER () AS n FROM table1";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testProblemSqlAnalytic6AggregateColumnValue() throws JSQLParserException {
+		String stmt = "SELECT a, sum(b + 5) OVER (ORDER BY a) AS n FROM table1";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
 
 	public void testOracleJoin() throws JSQLParserException {
 		String stmt = "SELECT * FROM tabelle1, tabelle2 WHERE tabelle1.a = tabelle2.b(+)";