withitem - deparsing merged and modified

Author: wumpz

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

@@ -410,7 +410,13 @@ public void visit(SetOperationList list) {
 
     @Override
     public void visit(WithItem withItem) {
-        buffer.append(withItem.toString());
+        buffer.append(withItem.getName());
+        if (withItem.getWithItemList()!=null) {
+            buffer.append(" ").append(PlainSelect.getStringList(withItem.getWithItemList(), true, true));
+        }
+        buffer.append(" AS (");
+        withItem.getSelectBody().accept(this);
+        buffer.append(")");
     }
 
     @Override

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

@@ -111,10 +111,7 @@ public void visit(Select select) {
             buffer.append("WITH ");
             for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {
                 WithItem withItem = iter.next();
-                buffer.append(withItem.getName());
-                buffer.append(" AS (");
-                withItem.getSelectBody().accept(selectDeParser);
-                buffer.append(")");
+                withItem.accept(selectDeParser);
                 if (iter.hasNext()) {
                     buffer.append(",");
                 }