fixes #766

Author: wumpz

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

@@ -9,11 +9,10 @@
  */
 package net.sf.jsqlparser.expression;
 
-import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
-import net.sf.jsqlparser.statement.select.OrderByElement;
-
 import java.util.List;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+import net.sf.jsqlparser.statement.select.OrderByElement;
 
 public class AnalyticExpression extends ASTNodeAccessImpl implements Expression {
 
@@ -29,6 +28,32 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private boolean distinct = false;
     private boolean ignoreNulls = false;
 
+    public AnalyticExpression() {
+    }
+
+    public AnalyticExpression(Function function) {
+        name = function.getName();
+        allColumns = function.isAllColumns();
+        distinct = function.isDistinct();
+
+        ExpressionList list = function.getParameters();
+        if (list != null) {
+            if (list.getExpressions().size() > 3) {
+                throw new IllegalArgumentException("function object not valid to initialize analytic expression");
+            }
+
+            expression = list.getExpressions().get(0);
+            if (list.getExpressions().size() > 1) {
+                offset = list.getExpressions().get(1);
+            }
+            if (list.getExpressions().size() > 2) {
+                defaultValue = list.getExpressions().get(2);
+            }
+        }
+        ignoreNulls = function.isIgnoreNulls();
+        keep = function.getKeep();
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);

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

@@ -24,6 +24,7 @@ public class Function extends ASTNodeAccessImpl implements Expression {
     private Expression attribute;
     private String attributeName;
     private KeepExpression keep = null;
+    private boolean ignoreNulls = false;
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -46,6 +47,20 @@ public void setAllColumns(boolean b) {
         allColumns = b;
     }
 
+    public boolean isIgnoreNulls() {
+        return ignoreNulls;
+    }
+
+    /**
+     * This is at the moment only necessary for AnalyticExpression initialization and not for normal
+     * functions. Therefore there is no deparsing for it for normal functions.
+     *
+     * @param ignoreNulls
+     */
+    public void setIgnoreNulls(boolean ignoreNulls) {
+        this.ignoreNulls = ignoreNulls;
+    }
+
     /**
      * true if the function is "distinct"
      *

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

@@ -2700,8 +2700,6 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD(2) retval=NumericBind()
 
-        | LOOKAHEAD(AnalyticExpression()) retval=AnalyticExpression() 
-
         | LOOKAHEAD(3) retval=ExtractExpression()
 
         | retval=MySQLGroupConcat()
@@ -2710,7 +2708,7 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD(FunctionWithCondParams()) retval = FunctionWithCondParams()
 
-        | LOOKAHEAD(Function()) retval=Function()
+        | LOOKAHEAD(Function()) retval=Function() [ LOOKAHEAD(2) retval = AnalyticExpression((Function)retval) ]
 
         | LOOKAHEAD(2) retval = IntervalExpression() { dateExpressionAllowed = false; }
 
@@ -2893,29 +2891,29 @@ KeepExpression KeepExpression() : {
     }
 }
 
-AnalyticExpression AnalyticExpression() :
+AnalyticExpression AnalyticExpression(Function function) :
 {
-    AnalyticExpression retval = new AnalyticExpression();
+    AnalyticExpression retval = new AnalyticExpression(function);
     ExpressionList expressionList = null;
     List<OrderByElement> olist = null;
     Token token = null;
     Expression expr = null;
     Expression offset = null;
     Expression defaultValue = null;
     WindowElement windowElement = null;
-    KeepExpression keep = null;
-    boolean distinct = false;
-    boolean ignoreNulls = false;
+    //KeepExpression keep = null;
+    //boolean distinct = false;
+    //boolean ignoreNulls = false;
 }
 {
-    token=<S_IDENTIFIER> { retval.setName(token.image); }
+    /* 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() ]
+    /* [ keep=KeepExpression() ] */
 
     (<K_OVER> {retval.setType(AnalyticType.OVER);} 
         | <K_WITHIN> <K_GROUP> {retval.setType(AnalyticType.WITHIN_GROUP);} )
@@ -2925,12 +2923,12 @@ AnalyticExpression AnalyticExpression() :
         [olist=OrderByElements() [windowElement = WindowElement() ] ]
 
     {
-        retval.setDistinct(distinct);
-        retval.setIgnoreNulls(ignoreNulls);
-        retval.setExpression(expr);
-        retval.setOffset(offset);
-        retval.setDefaultValue(defaultValue);
-        retval.setKeep(keep);
+        //retval.setDistinct(distinct);
+        //retval.setIgnoreNulls(ignoreNulls);
+        //retval.setExpression(expr);
+        //retval.setOffset(offset);
+        //retval.setDefaultValue(defaultValue);
+        //retval.setKeep(keep);
         retval.setPartitionExpressionList(expressionList);
         retval.setOrderByElements(olist);
         retval.setWindowElement(windowElement);
@@ -3189,6 +3187,7 @@ Function InternalFunction(Function retval) :
     Token tk1 = null;
     Token tk2 = null;
     Expression expr1 = null;
+    boolean ignoreNulls = false;
 }
 {
     funcName=RelObjectNameExt()
@@ -3203,11 +3202,10 @@ Function InternalFunction(Function retval) :
 			LOOKAHEAD(NamedExpressionListExprFirst()) namedExpressionList = NamedExpressionListExprFirst()
 			| 
             LOOKAHEAD(3) expressionList=SimpleExpressionList()
-            //| 
-            //LOOKAHEAD(ConditionExpressionList()) expressionList=ConditionExpressionList()
 			|  
 			expr = SubSelect() { expr.setUseBrackets(false); expressionList = new ExpressionList(expr); } 
         )] 
+        [ <K_IGNORE> <K_NULLS> {retval.setIgnoreNulls(true); }]
 	")"
 
     [ "." ( 

src/test/java/net/sf/jsqlparser/statement/select/NestedBracketsPerformanceTest.java

@@ -11,18 +11,17 @@
 
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.test.TestUtils;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  *
  * @author tw
  */
 public class NestedBracketsPerformanceTest {
+
     @Test
-    @Ignore
     public void testIssue766() throws JSQLParserException {
-        TestUtils.assertSqlCanBeParsedAndDeparsed("SELECT concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat('1','2'),'3'),'4'),'5'),'6'),'7'),'8'),'9'),'10'),'11'),'12'),'13'),'14'),'15'),'16'),'17'),'18'),'19'),'20'),'21'),col1 FROM tbl t1");
+        TestUtils.assertSqlCanBeParsedAndDeparsed("SELECT concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat(concat('1','2'),'3'),'4'),'5'),'6'),'7'),'8'),'9'),'10'),'11'),'12'),'13'),'14'),'15'),'16'),'17'),'18'),'19'),'20'),'21'),col1 FROM tbl t1", true);
     }
 
     @Test