fixes #99

JSQLParser · Jan 10, 2015 · 5ac27a7 · 5ac27a7
1 parent e475666
commit 5ac27a7
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 5 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/SubSelect.java b/src/main/java/net/sf/jsqlparser/statement/select/SubSelect.java
@@ -21,6 +21,8 @@
  */
 package net.sf.jsqlparser.statement.select;
 
+import java.util.Iterator;
+import java.util.List;
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
@@ -35,6 +37,7 @@ public class SubSelect implements FromItem, Expression, ItemsList {
 	private SelectBody selectBody;
 	private Alias alias;
     private boolean useBrackets = true;
+    private List<WithItem> withItemsList;
 
     private Pivot pivot;
 
@@ -83,6 +86,14 @@ public boolean isUseBrackets() {
     public void setUseBrackets(boolean useBrackets) {
         this.useBrackets = useBrackets;
     }
+
+    public List<WithItem> getWithItemsList() {
+		return withItemsList;
+	}
+
+	public void setWithItemsList(List<WithItem> withItemsList) {
+		this.withItemsList = withItemsList;
+	}
 
 	@Override
 	public void accept(ItemsListVisitor itemsListVisitor) {
@@ -91,8 +102,27 @@ public void accept(ItemsListVisitor itemsListVisitor) {
 
 	@Override
 	public String toString() {
-		return (useBrackets?"(":"") + selectBody + (useBrackets?")":"") 
-                + ((pivot != null) ? " " + pivot : "")
-                + ((alias != null) ? alias.toString() : "");
+        StringBuilder retval = new StringBuilder();
+        if (useBrackets)
+            retval.append("(");
+        if (withItemsList != null && !withItemsList.isEmpty()) {
+			retval.append("WITH ");
+			for (Iterator<WithItem> iter = withItemsList.iterator(); iter.hasNext();) {
+				WithItem withItem = (WithItem) iter.next();
+				retval.append(withItem);
+				if (iter.hasNext()) {
+					retval.append(",");
+				}
+				retval.append(" ");
+			}
+		}
+        retval.append(selectBody);
+        if (useBrackets)
+            retval.append(")");
+
+		if (pivot != null) retval.append(" ").append(pivot);
+        if (alias != null) retval.append(alias.toString());
+
+        return retval.toString();
 	}
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -181,6 +181,17 @@ public void visit(SelectExpressionItem selectExpressionItem) {
     @Override
     public void visit(SubSelect subSelect) {
         buffer.append("(");
+        if (subSelect.getWithItemsList() != null && !subSelect.getWithItemsList().isEmpty()) {
+            buffer.append("WITH ");
+            for (Iterator<WithItem> iter = subSelect.getWithItemsList().iterator(); iter.hasNext();) {
+                WithItem withItem = iter.next();
+                withItem.accept(this);
+                if (iter.hasNext()) {
+                    buffer.append(",");
+                }
+                buffer.append(" ");
+            }
+        }
         subSelect.getSelectBody().accept(this);
         buffer.append(")");
         Pivot pivot = subSelect.getPivot();

diff --git a/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj b/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj
@@ -2030,11 +2030,13 @@ Function Function():
 SubSelect SubSelect():
 {
 	SelectBody selectBody = null;
+    SubSelect subSelect = new SubSelect();
+    List<WithItem> with = null;
 }
 {
+    [ with=WithList() { subSelect.setWithItemsList(with); } ]
     selectBody=SelectBody()
     {
-    	SubSelect subSelect = new SubSelect();
     	subSelect.setSelectBody(selectBody);
     	return subSelect;
     }

diff --git a/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/test/select/SelectTest.java
@@ -1636,5 +1636,8 @@ public void testSelectJoin2() throws JSQLParserException {
     public void testSelectOracleColl() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * FROM the_table tt WHERE TT.COL1 = lines(idx).COL1");
     }
-
+
+    public void testSelectInnerWith() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM (WITH actor AS (SELECT 'a' aid FROM DUAL) SELECT aid FROM actor)");
+    }
 }