Merge pull request alibaba#667 from wenshao/master

bug fixed for schema stat visitor
shadowxiao · Sep 27, 2014 · 05ac271 · 05ac271
2 parents 3cd645e + d425942
commit 05ac271
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleSchemaStatVisitor.java
@@ -265,20 +265,7 @@ public void endVisit(OracleSelect x) {
     }
 
     public boolean visit(OracleSelect x) {
-        setCurrentTable(x);
-
-        if (x.getOrderBy() != null) {
-            x.getOrderBy().setParent(x);
-        }
-
-        accept(x.getWithSubQuery());
-        accept(x.getQuery());
-
-        setCurrentTable(x, (String) x.getQuery().getAttribute("table"));
-
-        accept(x.getOrderBy());
-
-        return false;
+        return visit((SQLSelect) x);
     }
 
     public void endVisit(SQLSelect x) {

diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java
@@ -964,6 +964,7 @@ public boolean visit(SQLSelect x) {
             x.getOrderBy().setParent(x);
         }
 
+        accept(x.getWithSubQuery());
         accept(x.getQuery());
 
         String originalTable = getCurrentTable();