fix: FromItemVisitorAdaptor also needs a SelectVisitor

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

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

@@ -17,6 +17,24 @@
 
 @SuppressWarnings({"PMD.UncommentedEmptyMethodBody"})
 public class FromItemVisitorAdapter<T> implements FromItemVisitor<T> {
+    private SelectVisitor<T> selectVisitor;
+
+    public FromItemVisitorAdapter(SelectVisitor<T> selectVisitor) {
+        this.selectVisitor = selectVisitor;
+    }
+
+    public FromItemVisitorAdapter() {
+        this.selectVisitor = new SelectVisitorAdapter<>();
+    }
+
+    public SelectVisitor<T> getSelectVisitor() {
+        return selectVisitor;
+    }
+
+    public FromItemVisitorAdapter<T> setSelectVisitor(SelectVisitor<T> selectVisitor) {
+        this.selectVisitor = selectVisitor;
+        return this;
+    }
 
     @Override
     public <S> T visit(Table table, S context) {
@@ -25,12 +43,12 @@ public <S> T visit(Table table, S context) {
 
     @Override
     public <S> T visit(ParenthesedSelect select, S context) {
-        return select.getPlainSelect().getFromItem().accept(this, context);
+        return select.getPlainSelect().accept(selectVisitor, context);
     }
 
     @Override
     public <S> T visit(LateralSubSelect lateralSubSelect, S context) {
-        return lateralSubSelect.getPlainSelect().getFromItem().accept(this, context);
+        return lateralSubSelect.getPlainSelect().accept(selectVisitor, context);
     }
 
     @Override
@@ -51,14 +69,14 @@ public <S> T visit(Values values, S context) {
 
     @Override
     public <S> T visit(PlainSelect plainSelect, S context) {
-        return plainSelect.getFromItem().accept(this, context);
+        return plainSelect.accept(selectVisitor, context);
     }
 
     @Override
     public <S> T visit(SetOperationList setOperationList, S context) {
         ArrayList<T> results = new ArrayList<>();
         for (Select select : setOperationList.getSelects()) {
-            results.add(select.accept(this, context));
+            results.add(select.accept(selectVisitor, context));
         }
         return results.isEmpty() ? null : results.get(0);
     }
@@ -75,6 +93,6 @@ public <S> T visit(Import imprt, S context) {
     }
 
     public <S> T visit(FromQuery fromQuery, S context) {
-        return fromQuery.getFromItem().accept(this, context);
+        return fromQuery.accept(selectVisitor, context);
     }
 }

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

@@ -28,9 +28,9 @@ public class SelectVisitorAdapter<T> implements SelectVisitor<T> {
 
     public SelectVisitorAdapter() {
         this.expressionVisitor = new ExpressionVisitorAdapter<>(this);
-        this.pivotVisitor = new PivotVisitorAdapter<>();
+        this.pivotVisitor = new PivotVisitorAdapter<>(this.expressionVisitor);
         this.selectItemVisitor = new SelectItemVisitorAdapter<>(this.expressionVisitor);
-        this.fromItemVisitor = new FromItemVisitorAdapter<>();
+        this.fromItemVisitor = new FromItemVisitorAdapter<>(this);
     }
 
     public SelectVisitorAdapter(ExpressionVisitor<T> expressionVisitor,