fixes #169

Author: wumpz

README.md

@@ -22,6 +22,7 @@ JSqlParser is dual licensed under **LGPL V2.1** or **Apache Software License, Ve
 Please provide feedback on https://github.com/JSQLParser/JSqlParser/issues/677, about removing bracket identifier quotation to support array processing.
 
 ## News
+* breaking **API** change: to support chained functions attribute type was changed to **Expression**
 * Released version **1.4** of JSqlParser
 * Released version **1.3** of JSqlParser
 * Changed behaviour of dotted multipart names for user variables, tables and columns to accept e.g. ORM class names. To achieve this some behaviour of name parsing had to be changed. Before this the parser would fail missing databasenames for SqlServer queries (server..schema.table). But this is allowed for the schema (server.database..table). Now the parser accepts missing inner names per se to avoid some very complicated parsing rules.
@@ -58,6 +59,7 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 2.0
 
+* support for chained functions
 * first support for **FOR XML PATH**
 * support for **NEXTVAL FOR**
 * changed all source code license headers to reflect the dual license of JSqlParser more correctly

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

@@ -21,7 +21,8 @@ public class Function extends ASTNodeAccessImpl implements Expression {
     private boolean allColumns = false;
     private boolean distinct = false;
     private boolean isEscaped = false;
-    private String attribute;
+    private Expression attribute;
+    private String attributeName;
     private KeepExpression keep = null;
 
     @Override
@@ -77,7 +78,6 @@ public void setParameters(ExpressionList list) {
      *
      * @return the list of named parameters of the function (if any, else null)
      */
-
     public NamedExpressionList getNamedParameters() {
         return namedParameters;
     }
@@ -99,14 +99,22 @@ public void setEscaped(boolean isEscaped) {
         this.isEscaped = isEscaped;
     }
 
-    public String getAttribute() {
+    public Expression getAttribute() {
         return attribute;
     }
 
-    public void setAttribute(String attribute) {
+    public void setAttribute(Expression attribute) {
         this.attribute = attribute;
     }
 
+    public String getAttributeName() {
+        return attributeName;
+    }
+
+    public void setAttributeName(String attributeName) {
+        this.attributeName = attributeName;
+    }
+
     public KeepExpression getKeep() {
         return keep;
     }
@@ -120,14 +128,14 @@ public String toString() {
         String params;
 
         if (parameters != null || namedParameters != null) {
-            if(parameters != null){
+            if (parameters != null) {
                 params = parameters.toString();
                 if (isDistinct()) {
                     params = params.replaceFirst("\\(", "(DISTINCT ");
                 } else if (isAllColumns()) {
                     params = params.replaceFirst("\\(", "(ALL ");
                 }
-            } else{
+            } else {
                 params = namedParameters.toString();
             }
         } else if (isAllColumns()) {
@@ -139,7 +147,9 @@ public String toString() {
         String ans = name + "" + params + "";
 
         if (attribute != null) {
-            ans += "." + attribute;
+            ans += "." + attribute.toString();
+        } else if (attributeName != null) {
+            ans += "." + attributeName;
         }
 
         if (keep != null) {

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

@@ -431,6 +431,8 @@ public void visit(Function function) {
 
         if (function.getAttribute() != null) {
             buffer.append(".").append(function.getAttribute());
+        } else if (function.getAttributeName() != null) {
+            buffer.append(".").append(function.getAttributeName());
         }
         if (function.getKeep() != null) {
             buffer.append(" ").append(function.getKeep());

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

@@ -3111,6 +3111,20 @@ Function FunctionWithCondParams() #Function: {
 Function Function() #Function:
 {
     Function retval = new Function();
+}
+{
+    (
+        "{" <K_FN> { retval.setEscaped(true); }  InternalFunction(retval) "}"
+        | InternalFunction(retval)
+    ) 
+    {
+        linkAST(retval,jjtThis);
+        return retval;
+    }
+}
+
+Function InternalFunction(Function retval) :
+{
     String funcName = null;
     String tmp = null;
     List<Expression> expressions = new ArrayList<Expression>();
@@ -3123,8 +3137,6 @@ Function Function() #Function:
     Expression expr1 = null;
 }
 {
-    ["{" <K_FN> { retval.setEscaped(true); } ]
-
     funcName=RelObjectNameExt()
 
     [ "." tmp=RelObjectNameExt() { funcName+= "." + tmp; } ["." tmp=RelObjectNameExt() { funcName+= "." + tmp; }]]
@@ -3144,17 +3156,19 @@ Function Function() #Function:
         )] 
 	")"
 
-    [ "." tmp=RelObjectName() { retval.setAttribute(tmp); }]
+    [ "." ( 
+            LOOKAHEAD(2) expr1=Function() { retval.setAttribute(expr1); }
+            | tmp=RelObjectName() { retval.setAttributeName(tmp); }
+          )
+    ]
 
-    [ keep = KeepExpression() ]
+    [ LOOKAHEAD(2) keep = KeepExpression() ]
 
-    ["}"]
     {
         retval.setParameters(expressionList);
         retval.setNamedParameters(namedExpressionList);
         retval.setName(funcName);
         retval.setKeep(keep);
-        linkAST(retval,jjtThis);
         return retval;
     }
 } 

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

@@ -3412,6 +3412,11 @@ public void testForXmlPath() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT '|' + person_name FROM person JOIN person_group ON person.person_id = person_group.person_id WHERE person_group.group_id = 1 FOR XML PATH('')");
     }
 
+    @Test
+    public void testChainedunctions() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT func('').func2('') AS foo FROM some_tables");
+    }
+
 //    @Test
 //    public void testIntervalExpression() throws JSQLParserException {
 //        assertSqlCanBeParsedAndDeparsed("SELECT count(emails.id) FROM emails WHERE (emails.date_entered + 30 DAYS) > CURRENT_DATE");