OracleHierarchicalExpression implemented

Author: wumpz

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

@@ -138,4 +138,6 @@ public interface ExpressionVisitor {
 	void visit(ExtractExpression eexpr);
 
 	void visit(IntervalExpression iexpr);
+	
+	void visit(OracleHierarchicalExpression oexpr);
 }

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

@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2013 JSQLParser
+ * %%
+ * This program 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 program 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 General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+/**
+ *
+ * @author toben
+ */
+public class OracleHierarchicalExpression implements Expression {
+
+	private Expression startExpression;
+	private Expression connectExpression;
+	private boolean noCycle = false;
+
+	public Expression getStartExpression() {
+		return startExpression;
+	}
+
+	public void setStartExpression(Expression startExpression) {
+		this.startExpression = startExpression;
+	}
+
+	public Expression getConnectExpression() {
+		return connectExpression;
+	}
+
+	public void setConnectExpression(Expression connectExpression) {
+		this.connectExpression = connectExpression;
+	}
+
+	public boolean isNoCycle() {
+		return noCycle;
+	}
+
+	public void setNoCycle(boolean noCycle) {
+		this.noCycle = noCycle;
+	}
+
+	@Override
+	public void accept(ExpressionVisitor expressionVisitor) {
+		expressionVisitor.visit(this);
+	}
+
+	public String toString() {
+		StringBuilder b = new StringBuilder();
+		if (startExpression != null) {
+			b.append(" START WITH ").append(startExpression.toString());
+		}
+		b.append(" CONNECT BY ");
+		if (isNoCycle()) {
+			b.append("NOCYCLE ");
+		}
+		b.append(connectExpression.toString());
+		return b.toString();
+	}
+}

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

@@ -26,6 +26,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+import net.sf.jsqlparser.expression.OracleHierarchicalExpression;
 
 /**
  * The core of a "SELECT" statement (no UNION, no ORDER BY)
@@ -43,6 +44,7 @@ public class PlainSelect implements SelectBody {
 	private Expression having;
 	private Limit limit;
 	private Top top;
+	private OracleHierarchicalExpression oracleHierarchical = null;
 
 	/**
 	 * The {@link FromItem} in this query
@@ -159,7 +161,15 @@ public void setGroupByColumnReferences(List<Expression> list) {
 		groupByColumnReferences = list;
 	}
 
-    @Override
+	public OracleHierarchicalExpression getOracleHierarchical() {
+		return oracleHierarchical;
+	}
+
+	public void setOracleHierarchical(OracleHierarchicalExpression oracleHierarchical) {
+		this.oracleHierarchical = oracleHierarchical;
+	}
+
+	@Override
 	public String toString() {
 		StringBuilder sql = new StringBuilder("SELECT ");
 		if (distinct != null) {
@@ -186,6 +196,9 @@ public String toString() {
 			if (where != null) {
 				sql.append(" WHERE ").append(where);
 			}
+			if (oracleHierarchical != null) {
+				sql.append(oracleHierarchical.toString());
+			}
 			sql.append(getFormatedList(groupByColumnReferences, "GROUP BY"));
 			if (having != null) {
 				sql.append(" HAVING ").append(having);

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

@@ -41,6 +41,7 @@
 import net.sf.jsqlparser.expression.JdbcParameter;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.NullValue;
+import net.sf.jsqlparser.expression.OracleHierarchicalExpression;
 import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.TimeValue;
@@ -501,4 +502,8 @@ public void visit(IntervalExpression iexpr) {
     @Override
     public void visit(JdbcNamedParameter jdbcNamedParameter) {
     }
+
+	@Override
+	public void visit(OracleHierarchicalExpression oexpr) {
+	}
 }

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

@@ -482,4 +482,9 @@ public void visit(IntervalExpression iexpr) {
 	public void visit(JdbcNamedParameter jdbcNamedParameter) {
 		buffer.append(jdbcNamedParameter.toString());
 	}
+
+	@Override
+	public void visit(OracleHierarchicalExpression oexpr) {
+		buffer.append(oexpr.toString());
+	}
 }

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

@@ -81,6 +81,7 @@ import net.sf.jsqlparser.expression.ExtractExpression;
 import net.sf.jsqlparser.expression.WhenClause;
 import net.sf.jsqlparser.expression.AnyComparisonExpression;
 import net.sf.jsqlparser.expression.AllComparisonExpression;
+import net.sf.jsqlparser.expression.OracleHierarchicalExpression;
 import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
 import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseAnd;
 import net.sf.jsqlparser.expression.operators.arithmetic.BitwiseOr;
@@ -257,6 +258,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |	<K_START:"START">
 |	<K_CONNECT:"CONNECT">
 |	<K_PRIOR:"PRIOR">
+|   <K_NOCYCLE:"NOCYCLE">
 }
 
 
@@ -597,6 +599,7 @@ PlainSelect PlainSelect():
 	Expression having = null;
 	Limit limit = null;
 	Top top = null;
+	OracleHierarchicalExpression oracleHierarchicalQueryClause = null;
 }
 {
     <K_SELECT> 
@@ -623,7 +626,7 @@ PlainSelect PlainSelect():
       joins=JoinsList() ]
 
     [ where=WhereClause() { plainSelect.setWhere(where); }]
-	[ OracleHierarchicalQueryClause() ]
+	[ oracleHierarchicalQueryClause=OracleHierarchicalQueryClause() { plainSelect.setOracleHierarchical(oracleHierarchicalQueryClause); } ]
     [ groupByColumnReferences=GroupByColumnReferences() { plainSelect.setGroupByColumnReferences(groupByColumnReferences); }]
     [ having=Having() { plainSelect.setHaving(having); }]
 	[LOOKAHEAD(2) orderByElements = OrderByElements()	{ 		 plainSelect.setOrderByElements(orderByElements);	}   ]
@@ -1083,12 +1086,18 @@ Expression WhereClause():
     { return retval; }
 }
 
-Expression OracleHierarchicalQueryClause(): {}
+OracleHierarchicalExpression OracleHierarchicalQueryClause(): 
 {
-	[ <K_START> <K_WITH>  AndExpression() ]
-	<K_CONNECT> <K_BY> [ "NOCYCLE" ]  { allowOraclePrior=true; } AndExpression() { allowOraclePrior=false; }
+	OracleHierarchicalExpression result = new OracleHierarchicalExpression();
+	Expression expr;
+}
+{
+	[ <K_START> <K_WITH>  expr=AndExpression() {result.setStartExpression(expr);} ]
+	<K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ]  
+	{ allowOraclePrior=true; } expr=AndExpression() 
+	{ result.setConnectExpression(expr);allowOraclePrior=false; }
 
-	{ return null; }
+	{ return result; }
 }