Merge origin/master

Author: wumpz

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

@@ -47,6 +47,7 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private KeepExpression keep = null;
     private AnalyticType type = AnalyticType.OVER;
     private boolean distinct = false;
+    private boolean ignoreNulls = false;
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -133,6 +134,14 @@ public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
+    public boolean isIgnoreNulls() {
+        return ignoreNulls;
+    }
+
+    public void setIgnoreNulls(boolean ignoreNulls) {
+        this.ignoreNulls = ignoreNulls;
+    }
+
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
@@ -152,6 +161,9 @@ public String toString() {
         } else if (isAllColumns()) {
             b.append("*");
         }
+        if (isIgnoreNulls()) {
+            b.append(" IGNORE NULLS");
+        }
         b.append(") ");
         if (keep != null) {
             b.append(keep.toString()).append(" ");

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

@@ -2690,12 +2690,14 @@ AnalyticExpression AnalyticExpression() :
     WindowElement windowElement = null;
     KeepExpression keep = null;
     boolean distinct = false;
+    boolean ignoreNulls = false;
 }
 {
     token=<S_IDENTIFIER> { retval.setName(token.image); }
         "(" [ 
             [ <K_DISTINCT> {distinct = true;} ]
             (expr=SimpleExpression() ["," offset=SimpleExpression() ["," defaultValue=SimpleExpression() ]] | "*" { retval.setAllColumns(true); } )
+            [ <K_IGNORE> <K_NULLS> {ignoreNulls = true;}]
             ] ")" 
 
     [ keep=KeepExpression() ]
@@ -2709,6 +2711,7 @@ AnalyticExpression AnalyticExpression() :
 
     {
         retval.setDistinct(distinct);
+        retval.setIgnoreNulls(ignoreNulls);
         retval.setExpression(expr);
         retval.setOffset(offset);
         retval.setDefaultValue(defaultValue);