xmlserialize support patch for expressions

Author: wumpz

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

@@ -550,7 +550,7 @@ public void visit(VariableAssignment var) {
 
     @Override
     public void visit(XMLSerializeExpr expr) {
-        expr.getColumn().accept(this);
+        expr.getExpression().accept(this);
         for (OrderByElement elm : expr.getOrderByElements()) {
             elm.getExpression().accept(this);
         }

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

@@ -12,13 +12,12 @@
 import java.util.List;
 import static java.util.stream.Collectors.joining;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
-import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.select.OrderByElement;
 
 public class XMLSerializeExpr extends ASTNodeAccessImpl implements Expression {
 
-    private Column column;
+    private Expression expression;
     private List<OrderByElement> orderByElements;
     private ColDataType dataType;
 
@@ -27,12 +26,12 @@ public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
-    public Column getColumn() {
-        return column;
+    public Expression getExpression() {
+        return expression;
     }
 
-    public void setColumn(Column column) {
-        this.column = column;
+    public void setExpression(Expression expression) {
+        this.expression = expression;
     }
 
     public List<OrderByElement> getOrderByElements() {
@@ -53,7 +52,7 @@ public void setDataType(ColDataType dataType) {
 
     @Override
     public String toString() {
-        return "xmlserialize(xmlagg(xmltext(" + column + ") ORDER BY " + 
+        return "xmlserialize(xmlagg(xmltext(" + expression + ") ORDER BY " +
                 orderByElements.stream().map(item -> item.toString()).collect(joining(", ")) + 
                 ") AS " + dataType + ")";
     }

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

@@ -907,7 +907,7 @@ public void visit(VariableAssignment var) {
     public void visit(XMLSerializeExpr expr) {
         //xmlserialize(xmlagg(xmltext(COMMENT_LINE) ORDER BY COMMENT_SEQUENCE) as varchar(1024))
         buffer.append("xmlserialize(xmlagg(xmltext(");
-        expr.getColumn().accept(this);
+        expr.getExpression().accept(this);
         buffer.append(") ORDER BY ");
         for (Iterator<OrderByElement> i = expr.getOrderByElements().iterator(); i.hasNext();) {
             buffer.append(i.next().toString());

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

@@ -3790,20 +3790,20 @@ Function InternalFunction(Function retval) :
 
 XMLSerializeExpr XMLSerializeExpr(): {
    XMLSerializeExpr result;
-   Column column;
+   Expression expression;
    List<OrderByElement> orderByElements;
    ColDataType dataType;
 }
 {
     <K_XMLSERIALIZE> 
         "(" <K_XMLAGG> 
                 "(" <K_XMLTEXT> 
-                        "(" column=Column() ")" 
+                        "(" expression=SimpleExpression() ")"
                         orderByElements=OrderByElements() ")" 
                         <K_AS> dataType=ColDataType() ")"
     {
         result = new XMLSerializeExpr();
-        result.setColumn(column);
+        result.setExpression(expression);
         result.setOrderByElements(orderByElements);
         result.setDataType(dataType);
         return result;

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

@@ -32,4 +32,14 @@ public void testXmlAgg2() throws JSQLParserException {
     public void testXmlAgg3() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT xmlserialize(xmlagg(xmltext(COMMENT_LINE) ORDER BY COMMENT_SEQUENCE) AS varchar (1024))");
     }
+    
+    @Test
+    public void testXmlAgg4() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT xmlserialize(xmlagg(xmltext(COMMENT_LINE_PREFIX || COMMENT_LINE) ORDER BY COMMENT_SEQUENCE) AS varchar (1024))");
+    }
+
+    @Test
+    public void testXmlAgg5() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT xmlserialize(xmlagg(xmltext(CONCAT(', ', TRIM(SOME_COLUMN))) ORDER BY MY_SEQUENCE) AS varchar (1024))");
+    }
 }