fixes #593

Author: wumpz

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

@@ -48,6 +48,7 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private WindowElement windowElement;
     private KeepExpression keep = null;
     private AnalyticType type = AnalyticType.OVER;
+    private boolean distinct = false;
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -126,11 +127,22 @@ public void setType(AnalyticType type) {
         this.type = type;
     }
 
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
 
         b.append(name).append("(");
+        if (isDistinct()) {
+            b.append("DISTINCT ");
+        }
         if (expression != null) {
             b.append(expression.toString());
             if (offset != null) {
@@ -146,7 +158,7 @@ public String toString() {
         if (keep != null) {
             b.append(keep.toString()).append(" ");
         }
-        
+
         switch (type) {
             case WITHIN_GROUP:
                 b.append("WITHIN GROUP");

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

@@ -604,6 +604,9 @@ public void visit(AnalyticExpression aexpr) {
         WindowElement windowElement = aexpr.getWindowElement();
 
         buffer.append(name).append("(");
+        if (aexpr.isDistinct()) {
+            buffer.append("DISTINCT ");
+        }
         if (expression != null) {
             expression.accept(this);
             if (offset != null) {

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

@@ -2616,10 +2616,14 @@ AnalyticExpression AnalyticExpression() :
     Expression defaultValue = null;
     WindowElement windowElement = null;
     KeepExpression keep = null;
+    boolean distinct = false;
 }
 {
     token=<S_IDENTIFIER> { retval.setName(token.image); }
-        "(" [ expr=SimpleExpression() ["," offset=SimpleExpression() ["," defaultValue=SimpleExpression() ]] | "*" { retval.setAllColumns(true); } ] ")" 
+        "(" [ 
+            [ <K_DISTINCT> {distinct = true;} ]
+            (expr=SimpleExpression() ["," offset=SimpleExpression() ["," defaultValue=SimpleExpression() ]] | "*" { retval.setAllColumns(true); } )
+            ] ")" 
 
     [ keep=KeepExpression() ]
 
@@ -2631,6 +2635,7 @@ AnalyticExpression AnalyticExpression() :
         [olist=OrderByElements() [windowElement = WindowElement() ] ]
 
     {
+        retval.setDistinct(distinct);
         retval.setExpression(expr);
         retval.setOffset(offset);
         retval.setDefaultValue(defaultValue);

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

@@ -1618,6 +1618,11 @@ 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 testAnalyticFunction19() throws JSQLParserException {
+        String statement = "SELECT count(DISTINCT CASE WHEN client_organic_search_drop_flag = 1 THEN brand END) OVER (PARTITION BY client, category_1, category_2, category_3, category_4 ) AS client_brand_org_drop_count FROM sometable";
+        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";