fixes #134 - preserve order of query

Author: wumpz

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

@@ -27,50 +27,70 @@
  */
 public class OracleHierarchicalExpression implements Expression {
 
-	private Expression startExpression;
-	private Expression connectExpression;
-	private boolean noCycle = false;
+    private Expression startExpression;
+    private Expression connectExpression;
+    private boolean noCycle = false;
+    boolean connectFirst = false;
 
-	public Expression getStartExpression() {
-		return startExpression;
-	}
+    public Expression getStartExpression() {
+        return startExpression;
+    }
 
-	public void setStartExpression(Expression startExpression) {
-		this.startExpression = startExpression;
-	}
+    public void setStartExpression(Expression startExpression) {
+        this.startExpression = startExpression;
+    }
 
-	public Expression getConnectExpression() {
-		return connectExpression;
-	}
+    public Expression getConnectExpression() {
+        return connectExpression;
+    }
 
-	public void setConnectExpression(Expression connectExpression) {
-		this.connectExpression = connectExpression;
-	}
+    public void setConnectExpression(Expression connectExpression) {
+        this.connectExpression = connectExpression;
+    }
 
-	public boolean isNoCycle() {
-		return noCycle;
-	}
+    public boolean isNoCycle() {
+        return noCycle;
+    }
 
-	public void setNoCycle(boolean noCycle) {
-		this.noCycle = noCycle;
-	}
+    public void setNoCycle(boolean noCycle) {
+        this.noCycle = noCycle;
+    }
 
-	@Override
-	public void accept(ExpressionVisitor expressionVisitor) {
-		expressionVisitor.visit(this);
-	}
+    public boolean isConnectFirst() {
+        return connectFirst;
+    }
 
-	@Override
-	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();
-	}
+    public void setConnectFirst(boolean connectFirst) {
+        this.connectFirst = connectFirst;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder();
+        if (isConnectFirst()) {
+            b.append(" CONNECT BY ");
+            if (isNoCycle()) {
+                b.append("NOCYCLE ");
+            }
+            b.append(connectExpression.toString());
+            if (startExpression != null) {
+                b.append(" START WITH ").append(startExpression.toString());
+            }
+        } else {
+            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/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -1114,18 +1114,21 @@ OracleHierarchicalExpression OracleHierarchicalQueryClause():
 {
 	OracleHierarchicalExpression result = new OracleHierarchicalExpression();
 	Expression expr;
-	Expression connectExpr;
 }
 {
 	(
 				<K_START> <K_WITH>  expr=AndExpression() {result.setStartExpression(expr);}
-				<K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] connectExpr=AndExpression()
+				<K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] expr=AndExpression()
+                { result.setConnectExpression(expr); }
 			|
-				<K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] connectExpr=AndExpression()
+				<K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] expr=AndExpression()
+                { 
+                    result.setConnectExpression(expr); 
+                    result.setConnectFirst(true);
+                }
 				[ <K_START> <K_WITH>  expr=AndExpression() {result.setStartExpression(expr);} ]
 	)
 	{
-		result.setConnectExpression(connectExpr);
 		return result;
 	}
 }

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

@@ -1615,8 +1615,7 @@ public void testOracleHierarchicalQuery3() throws JSQLParserException {
 
     public void testOracleHierarchicalQuery4() throws JSQLParserException {
         String stmt = "SELECT last_name, employee_id, manager_id, LEVEL FROM employees CONNECT BY PRIOR employee_id = manager_id START WITH employee_id = 100 ORDER SIBLINGS BY last_name";
-        Statement parsed = CCJSqlParserUtil.parse(new StringReader(stmt));
-        assertStatementCanBeDeparsedAs(parsed, "SELECT last_name, employee_id, manager_id, LEVEL FROM employees START WITH employee_id = 100 CONNECT BY PRIOR employee_id = manager_id ORDER SIBLINGS BY last_name");
+        assertSqlCanBeParsedAndDeparsed(stmt);
     }
 
     public void testPostgreSQLRegExpCaseSensitiveMatch() throws JSQLParserException {