add WithItem to visitor interface

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/select/SelectVisitor.java

@@ -1,29 +1,31 @@
-/* ================================================================
- * JSQLParser : java based sql parser 
- * ================================================================
- *
- * Project Info:  http://jsqlparser.sourceforge.net
- * Project Lead:  Leonardo Francalanci (leoonardoo@yahoo.it);
- *
- * (C) Copyright 2004, by Leonardo Francalanci
- *
- * 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., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-package net.sf.jsqlparser.statement.select;
-
-public interface SelectVisitor {
-	public void visit(PlainSelect plainSelect);
-	
-	public void visit(SetOperationList setOpList);
-}
+/* ================================================================
+ * JSQLParser : java based sql parser 
+ * ================================================================
+ *
+ * Project Info:  http://jsqlparser.sourceforge.net
+ * Project Lead:  Leonardo Francalanci (leoonardoo@yahoo.it);
+ *
+ * (C) Copyright 2004, by Leonardo Francalanci
+ *
+ * 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., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+package net.sf.jsqlparser.statement.select;
+
+public interface SelectVisitor {
+
+	public void visit(PlainSelect plainSelect);
+
+	public void visit(SetOperationList setOpList);
+
+	public void visit(WithItem withItem);
+}

src/main/java/net/sf/jsqlparser/statement/select/WithItem.java

@@ -5,7 +5,7 @@
 /**
  * One of the parts of a "WITH" clause of a "SELECT" statement
  */
-public class WithItem {
+public class WithItem implements SelectBody {
 	private String name;
 	private List<SelectItem> withItemList;
 	private SelectBody selectBody;
@@ -54,5 +54,8 @@ public String toString() {
 		return name + ((withItemList != null) ? " " + PlainSelect.getStringList(withItemList, true, true) : "")
 				+ " AS (" + selectBody + ")";
 	}
-
+	
+	public void accept(SelectVisitor visitor) {
+		visitor.visit(this);
+	}
 }

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

@@ -10,6 +10,7 @@
 import net.sf.jsqlparser.statement.select.SelectItemVisitor;
 import net.sf.jsqlparser.statement.select.SelectVisitor;
 import net.sf.jsqlparser.statement.select.SetOperationList;
+import net.sf.jsqlparser.statement.select.WithItem;
 
 /**
  * Add aliases to every column and expression selected by a
@@ -96,4 +97,9 @@ protected String getNextAlias() {
 	public void setPrefix(String prefix) {
 		this.prefix = prefix;
 	}
+
+	@Override
+	public void visit(WithItem withItem) {
+		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+	}
 }

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

@@ -11,6 +11,7 @@
 import net.sf.jsqlparser.statement.select.SelectItemVisitor;
 import net.sf.jsqlparser.statement.select.SelectVisitor;
 import net.sf.jsqlparser.statement.select.SetOperationList;
+import net.sf.jsqlparser.statement.select.WithItem;
 
 /**
  * Connect all selected expressions with a binary expression. Out of select a,b from table 
@@ -69,6 +70,10 @@ public void visit(SetOperationList setOpList) {
 			select.accept(this);
 		}
 	}
+	
+	@Override
+	public void visit(WithItem withItem) {
+	}
 
 	@Override
 	public void visit(AllColumns allColumns) {

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

@@ -74,19 +74,29 @@ public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, Expres
 	 */
 	private List<String> otherItemNames;
 
+	/**
+	 * Main entry for this Tool class. A list of found tables is returned.
+	 * @param select
+	 * @return 
+	 */
 	public List<String> getTableList(Select select) {
 		otherItemNames = new ArrayList<String>();
 		tables = new ArrayList<String>();
 		if (select.getWithItemsList() != null) {
 			for (WithItem withItem : select.getWithItemsList()) {
-				otherItemNames.add(withItem.getName().toLowerCase());
-				withItem.getSelectBody().accept(this);
+				withItem.accept(this);
 			}
 		}
 		select.getSelectBody().accept(this);
 
 		return tables;
 	}
+	
+	@Override
+	public void visit(WithItem withItem) {
+		otherItemNames.add(withItem.getName().toLowerCase());
+		withItem.getSelectBody().accept(this);
+	}
 
 	@Override
 	public void visit(PlainSelect plainSelect) {

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

@@ -24,6 +24,7 @@
 import net.sf.jsqlparser.statement.select.SubJoin;
 import net.sf.jsqlparser.statement.select.SubSelect;
 import net.sf.jsqlparser.statement.select.Top;
+import net.sf.jsqlparser.statement.select.WithItem;
 
 /**
  * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
@@ -295,4 +296,8 @@ public void visit(SetOperationList list) {
 			deparseLimit(list.getLimit());
 		}
 	}
+
+	@Override
+	public void visit(WithItem withItem) {
+	}
 }