fixes #72

Author: wumpz

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

@@ -156,4 +156,6 @@ public interface ExpressionVisitor {
     void visit(NumericBind bind);
 
     void visit(KeepExpression aexpr);
+    
+    void visit(MySQLGroupConcat groupConcat);
 }

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

@@ -341,4 +341,16 @@ public void visit(KeepExpression expr) {
             element.getExpression().accept(this);
         }
     }
+
+    @Override
+    public void visit(MySQLGroupConcat groupConcat) {
+        for (Expression expr : groupConcat.getExpressionList().getExpressions()) {
+            expr.accept(this);
+        }
+        if (groupConcat.getOrderByElements() != null) {
+            for (OrderByElement element : groupConcat.getOrderByElements()) {
+                element.getExpression().accept(this);
+            }
+        }
+    }
 }

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

@@ -0,0 +1,118 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2015 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+/*
+ * Copyright (C) 2015 JSQLParser.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package net.sf.jsqlparser.expression;
+
+import java.util.List;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.statement.select.OrderByElement;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+
+/**
+ *
+ * @author toben
+ */
+public class MySQLGroupConcat implements Expression {
+
+    private ExpressionList expressionList;
+    private boolean distinct = false;
+    private List<OrderByElement> orderByElements;
+    private String separator;
+
+    public ExpressionList getExpressionList() {
+        return expressionList;
+    }
+
+    public void setExpressionList(ExpressionList expressionList) {
+        this.expressionList = expressionList;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public List<OrderByElement> getOrderByElements() {
+        return orderByElements;
+    }
+
+    public void setOrderByElements(List<OrderByElement> orderByElements) {
+        this.orderByElements = orderByElements;
+    }
+
+    public String getSeparator() {
+        return separator;
+    }
+
+    public void setSeparator(String separator) {
+        this.separator = separator;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder();
+        b.append("GROUP_CONCAT(");
+        if (isDistinct()) {
+            b.append("DISTINCT ");
+        }
+        b.append(PlainSelect.getStringList(expressionList.getExpressions(), true, false));
+        if (orderByElements != null && !orderByElements.isEmpty()) {
+            b.append(" ORDER BY ");
+            for (int i = 0; i < orderByElements.size(); i++) {
+                if (i > 0) {
+                    b.append(", ");
+                }
+                b.append(orderByElements.get(i).toString());
+            }
+        }
+        if (separator != null) {
+            b.append(" SEPARATOR ").append(separator);
+        }
+        b.append(")");
+        return b.toString();
+    }
+}

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -515,4 +515,8 @@ public void visit(NumericBind bind) {
     @Override
     public void visit(KeepExpression aexpr) {
     }
+
+    @Override
+    public void visit(MySQLGroupConcat groupConcat) {
+    }
 }

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

@@ -540,4 +540,9 @@ public void visit(NumericBind bind) {
     public void visit(KeepExpression aexpr) {
         buffer.append(aexpr.toString());
     }
+
+    @Override
+    public void visit(MySQLGroupConcat groupConcat) {
+        buffer.append(groupConcat.toString());
+    }
 }

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

@@ -1784,7 +1784,7 @@ Expression PrimaryExpression():
 
 	| LOOKAHEAD(ExtractExpression()) retval=ExtractExpression()
 
-    | MySQLGroupConcat()
+    | retval=MySQLGroupConcat()
 
     | LOOKAHEAD([sign="+" | sign="-"] JsonExpression()) [sign="+" | sign="-"] retval=JsonExpression()
 
@@ -2150,13 +2150,23 @@ Function Function():
     }
 }
 
-void MySQLGroupConcat():{}
+MySQLGroupConcat MySQLGroupConcat():{
+    MySQLGroupConcat retval = new MySQLGroupConcat();
+    ExpressionList expressionList = null;
+    List<OrderByElement> orderByList = null;
+    Token t;
+}
 {
     <K_GROUP_CONCAT> "(" 
-       [<K_DISTINCT>] SimpleExpressionList() 
-       OrderByElements()
-       [ <K_SEPARATOR> <S_CHAR_LITERAL> ]
+       [<K_DISTINCT>  { retval.setDistinct(true); } ] 
+       expressionList = SimpleExpressionList() 
+       [ orderByList = OrderByElements() { retval.setOrderByElements(orderByList); } ]
+       [ <K_SEPARATOR> t=<S_CHAR_LITERAL> { retval.setSeparator(t.image); } ]
     ")"
+    { 
+        retval.setExpressionList(expressionList);
+        return retval; 
+    }
 }
 
 

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

@@ -61,8 +61,8 @@ public void testAllSqlsParseDeparse() throws IOException {
                     success++;
                     LOG.info("   -> SUCCESS");
                 } catch (JSQLParserException ex) {
-                    LOG.log(Level.SEVERE, null, ex);
-                    LOG.info("   -> PROBLEM");
+                    //LOG.log(Level.SEVERE, null, ex);
+                    LOG.log(Level.INFO, "   -> PROBLEM {0}", ex.toString());
                 }
             }
         }