- removed deprecated union class (replaced by SetOperationList)

Author: wumpz

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

@@ -24,8 +24,6 @@
 
 public interface SelectVisitor {
 	public void visit(PlainSelect plainSelect);
-
-	public void visit(Union union);
 
 	public void visit(SetOperationList setOpList);
 }

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

@@ -3,8 +3,8 @@
 import net.sf.jsqlparser.statement.select.SetOperationList.SetOperationType;
 
 /**
- * Einzelne Set-Operation. Diese geben nur noch den einzelnen Operationsnamen aus.
- * Durch die SetOperationList wird alles zusammengehalten.
+ * Single Set-Operation (name). Placeholder for one specific set operation, e.g. 
+ * union, intersect.
  * @author tw
  */
 public abstract class SetOperation {

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

@@ -1,35 +1,13 @@
-/* ================================================================
- * 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;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Eine Set Operation. Diese besteht aus einer Liste von plainSelects verknüpft
- * mit Set-Operationen (UNION,INTERSECT,MINUS,EXCEPT). Diese Operationen haben
- * die gleiche Priorität, s.d. die Datenbanken dies von Links nach rechts
- * abarbeiten.
- *
+ * A database set operation. This operation consists of a list of plainSelects 
+ * connected by set operations (UNION,INTERSECT,MINUS,EXCEPT). All these operations
+ * have the same priority.
+ * @author tw
  */
 public class SetOperationList implements SelectBody {
 
@@ -47,11 +25,6 @@ public List getOrderByElements() {
 		return orderByElements;
 	}
 
-	/**
-	 * the list of {@link PlainSelect}s in this SetOperationList
-	 *
-	 * @return the list of {@link PlainSelect}s
-	 */
 	public List getPlainSelects() {
 		return plainSelects;
 	}
@@ -102,7 +75,7 @@ public String toString() {
 	}
 
 	/**
-	 * Unterstützte Set-Operationen.
+	 * list of set operations.
 	 */
 	public enum SetOperationType {
 

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

@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package net.sf.jsqlparser.statement.select;
 
 import net.sf.jsqlparser.statement.select.SetOperationList.SetOperationType;

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

@@ -24,7 +24,6 @@
 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.Union;
 
 /**
  * A class to de-parse (that is, tranform from JSqlParser hierarchy into a string) a
@@ -121,31 +120,6 @@ public void visit(PlainSelect plainSelect) {
 
 	}
 
-	public void visit(Union union) {
-		for (Iterator<PlainSelect> iter = union.getPlainSelects().iterator(); iter.hasNext();) {
-			buffer.append("(");
-			PlainSelect plainSelect = iter.next();
-			plainSelect.accept(this);
-			buffer.append(")");
-			if (iter.hasNext()) {
-				buffer.append(" UNION ");
-				if (union.isAll()) {
-					buffer.append("ALL ");// should UNION be a BinaryExpression ?
-				}
-			}
-
-		}
-
-		if (union.getOrderByElements() != null) {
-			deparseOrderBy(union.getOrderByElements());
-		}
-
-		if (union.getLimit() != null) {
-			deparseLimit(union.getLimit());
-		}
-
-	}
-
 	public void visit(OrderByElement orderBy) {
 		orderBy.getExpression().accept(expressionVisitor);
 		if (!orderBy.isAsc())

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

@@ -127,7 +127,6 @@ import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 import net.sf.jsqlparser.statement.select.SelectItem;
 import net.sf.jsqlparser.statement.select.SubSelect;
 import net.sf.jsqlparser.statement.select.Top;
-import net.sf.jsqlparser.statement.select.Union;
 import net.sf.jsqlparser.statement.select.SetOperationList;
 import net.sf.jsqlparser.statement.select.UnionOp;
 import net.sf.jsqlparser.statement.select.MinusOp;

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

@@ -28,7 +28,6 @@
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SelectExpressionItem;
 import net.sf.jsqlparser.statement.select.SetOperationList;
-import net.sf.jsqlparser.statement.select.Union;
 import net.sf.jsqlparser.util.deparser.ExpressionDeParser;
 import net.sf.jsqlparser.util.deparser.SelectDeParser;
 import net.sf.jsqlparser.util.deparser.StatementDeParser;

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

@@ -59,7 +59,6 @@
 import net.sf.jsqlparser.statement.select.SetOperationList;
 import net.sf.jsqlparser.statement.select.SubJoin;
 import net.sf.jsqlparser.statement.select.SubSelect;
-import net.sf.jsqlparser.statement.select.Union;
 
 public class TablesNamesFinder implements SelectVisitor, FromItemVisitor, ExpressionVisitor, ItemsListVisitor {
 	private List tables;
@@ -84,13 +83,6 @@ public void visit(PlainSelect plainSelect) {
 
 	}
 
-	public void visit(Union union) {
-		for (Iterator iter = union.getPlainSelects().iterator(); iter.hasNext();) {
-			PlainSelect plainSelect = (PlainSelect) iter.next();
-			visit(plainSelect);
-		}
-	}
-
 	public void visit(Table tableName) {
 		String tableWholeName = tableName.getWholeTableName();
 		tables.add(tableWholeName);