wildcard extension for analytic expression

Author: wumpz

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

@@ -7,7 +7,8 @@
 /**
  * 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)
+ * by test). Additional there can be an expression for an analytical aggregate
+ * like sum(col) or the "all collumns" wildcard like count(*).
  *
  * @author tw
  */
@@ -17,6 +18,7 @@ public class AnalyticExpression implements Expression {
 	private List<OrderByElement> orderByElements;
 	private String name;
 	private Expression expression;
+	private boolean allColumns = false;
 
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {
@@ -62,6 +64,8 @@ public String toString() {
 		b.append(name).append("(");
 		if (expression != null) {
 			b.append(expression.toString());
+		} else if (isAllColumns()) {
+			b.append("*");
 		}
 		b.append(") OVER (");
 		if (partitionByColumns != null && !partitionByColumns.isEmpty()) {
@@ -89,4 +93,12 @@ public String toString() {
 
 		return b.toString();
 	}
+
+	public boolean isAllColumns() {
+		return allColumns;
+	}
+
+	public void setAllColumns(boolean allColumns) {
+		this.allColumns = allColumns;
+	}
 }

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

@@ -639,45 +639,6 @@ SetOperationList SetOperationList():
 	}
 }
 
-/*
-Union Union():
-{ 
-	Union union = new Union(); 
-	List orderByElements = null;
-	Limit limit = null;
-	PlainSelect select = null;
-	ArrayList selects = new ArrayList();
-
-this is not 100% right, since multiple UNION could have different ALL/DISTINCT clauses...
-
-}
-{
-	(
-	
-		(
-			"(" select=PlainSelect() {selects.add(select);} ")"
-				<K_UNION> [ <K_ALL> { union.setAll(true); } | <K_DISTINCT> 	{ union.setDistinct(true); } ]
-			"(" select=PlainSelect() {selects.add(select);} ")"
-			(	<K_UNION> [ <K_ALL> | <K_DISTINCT> ] "(" select=PlainSelect() {selects.add(select);} ")" )*
-			[orderByElements=OrderByElements() {union.setOrderByElements(orderByElements);} ]
-			[limit=Limit() {union.setLimit(limit);} ]
-		)
-		| 	
-		(
-			select=PlainSelect() {selects.add(select);} 
-				<K_UNION> [ <K_ALL> { union.setAll(true); } | <K_DISTINCT> 	{ union.setDistinct(true); } ]
-			select=PlainSelect() {selects.add(select);}
-			(	<K_UNION> [ <K_ALL> | <K_DISTINCT> ] select=PlainSelect() {selects.add(select);} )*
-			
-		)
-	)
-
-	{ 
-		union.setPlainSelects(selects);
-		return union; 
-	}
-}
-*/
 
 List<WithItem> WithList():
 {
@@ -1569,7 +1530,7 @@ AnalyticExpression AnalyticExpression() :
 	Expression expr = null;
 }
 {
-	token=<S_IDENTIFIER> { retval.setName(token.image); } "(" [ expr=SimpleExpression() ] ")" <K_OVER> "(" 
+	token=<S_IDENTIFIER> { retval.setName(token.image); } "(" [ expr=SimpleExpression() | "*" { retval.setAllColumns(true); } ] ")" <K_OVER> "(" 
         [<K_PARTITION> <K_BY> (column=Column() {plist.add(column);} )+ ] 
         [olist=OrderByElements() ]
 	{

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

@@ -661,6 +661,16 @@ public void testProblemSqlAnalytic6AggregateColumnValue() throws JSQLParserExcep
 		String stmt = "SELECT a, sum(b + 5) OVER (ORDER BY a) AS n FROM table1";
 		assertSqlCanBeParsedAndDeparsed(stmt);
 	}
+	
+	public void testProblemSqlAnalytic7Count() throws JSQLParserException {
+		String stmt = "SELECT count(*) OVER () AS n FROM table1";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
+	
+	public void testProblemSqlAnalytic8Complex() throws JSQLParserException {
+		String stmt = "SELECT ID, NAME, SALARY, SUM(SALARY) OVER () AS SUM_SAL, AVG(SALARY) OVER () AS AVG_SAL, MIN(SALARY) OVER () AS MIN_SAL, MAX(SALARY) OVER () AS MAX_SAL, COUNT(*) OVER () AS ROWS FROM STAFF WHERE ID < 60 ORDER BY ID";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
 
 	public void testOracleJoin() throws JSQLParserException {
 		String stmt = "SELECT * FROM tabelle1, tabelle2 WHERE tabelle1.a = tabelle2.b(+)";