completed ExpressionVisitorAdapter

xle · Jun 5, 2015 · 348fd7f · 348fd7f
1 parent 94c6355
commit 348fd7f
Showing 1 changed file with 38 additions and 3 deletions.
diff --git a/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java
@@ -27,18 +27,46 @@
 import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.OrderByElement;
+import net.sf.jsqlparser.statement.select.PivotVisitor;
+import net.sf.jsqlparser.statement.select.SelectVisitor;
 import net.sf.jsqlparser.statement.select.SubSelect;
+import net.sf.jsqlparser.statement.select.WithItem;
 
 public class ExpressionVisitorAdapter implements ExpressionVisitor, ItemsListVisitor {
 
+    private SelectVisitor selectVisitor;
+
+    public SelectVisitor getSelectVisitor() {
+        return selectVisitor;
+    }
+
+    public void setSelectVisitor(SelectVisitor selectVisitor) {
+        this.selectVisitor = selectVisitor;
+    }
+
+    private PivotVisitor pivotVisitor;
+
+    public PivotVisitor getPivotVisitor() {
+        return pivotVisitor;
+    }
+
+    public void setPivotVisitor(PivotVisitor pivotVisitor) {
+        this.pivotVisitor = pivotVisitor;
+    }
+
     @Override
     public void visit(NullValue value) {
 
     }
 
     @Override
     public void visit(Function function) {
-
+        if (function.getParameters() != null) {
+            function.getParameters().accept(this);
+        }
+        if (function.getKeep() != null) {
+            function.getKeep().accept(this);
+        }
     }
 
     @Override
@@ -182,7 +210,15 @@ public void visit(Column column) {
 
     @Override
     public void visit(SubSelect subSelect) {
-
+        if (selectVisitor != null) {
+            for (WithItem item : subSelect.getWithItemsList()) {
+                item.accept(selectVisitor);
+            }
+        }
+        subSelect.getSelectBody().accept(selectVisitor);
+        if (pivotVisitor != null && subSelect.getPivot() != null) {
+            subSelect.getPivot().accept(pivotVisitor);
+        }
     }
 
     @Override
@@ -274,7 +310,6 @@ public void visit(ExtractExpression expr) {
 
     @Override
     public void visit(IntervalExpression expr) {
-
     }
 
     @Override