feat: ParenthesedSelectBody and ParenthesedFromItem

- delete unneeded ParenthesedJoin - rename ParenthesisFromItem into ParenthesedFromItem
JSQLParser · wumpz · Apr 27, 2023 · Dec 11, 2022 · Dec 22, 2022 · Jan 8, 2023
commit ad9e98d9d89c73ae28c933241fe163ee81d60bf1
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitor.java
@@ -25,5 +25,5 @@ public interface FromItemVisitor {
 
     void visit(TableFunction tableFunction);
 
-    void visit(ParenthesisFromItem aThis);
+    void visit(ParenthesedFromItem aThis);
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java
@@ -45,7 +45,7 @@ public void visit(TableFunction valuesList) {
     }
 
     @Override
-    public void visit(ParenthesisFromItem aThis) {
+    public void visit(ParenthesedFromItem aThis) {
 
     }
 }
diff --git a/...statement/select/ParenthesisFromItem.java → ...statement/select/ParenthesedFromItem.java b/...statement/select/ParenthesisFromItem.java → ...statement/select/ParenthesedFromItem.java
@@ -16,17 +16,17 @@
 import java.util.List;
 import java.util.Optional;
 
-public class ParenthesisFromItem implements FromItem {
+public class ParenthesedFromItem implements FromItem {
     private FromItem fromItem;
     private List<Join> joins;
     private Alias alias;
     private Pivot pivot;
     private UnPivot unPivot;
 
-    public ParenthesisFromItem() {
+    public ParenthesedFromItem() {
     }
 
-    public ParenthesisFromItem(FromItem fromItem) {
+    public ParenthesedFromItem(FromItem fromItem) {
         setFromItem(fromItem);
     }
 
@@ -118,13 +118,13 @@ public void setUnPivot(UnPivot unpivot) {
         this.unPivot = unpivot;
     }
 
-    public ParenthesisFromItem withFromItem(FromItem fromItem) {
+    public ParenthesedFromItem withFromItem(FromItem fromItem) {
         this.setFromItem(fromItem);
         return this;
     }
 
     @Override
-    public ParenthesisFromItem withAlias(Alias alias) {
+    public ParenthesedFromItem withAlias(Alias alias) {
         this.setAlias(alias);
         return this;
     }

diff --git a/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedJoin.java b/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedJoin.java
diff --git a/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java b/src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java
@@ -938,7 +938,7 @@ public void visit(UseStatement use) {
     }
 
     @Override
-    public void visit(ParenthesisFromItem parenthesis) {
+    public void visit(ParenthesedFromItem parenthesis) {
         parenthesis.getFromItem().accept(this);
     }
 

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/SelectDeParser.java
@@ -35,7 +35,7 @@
 import net.sf.jsqlparser.statement.select.Offset;
 import net.sf.jsqlparser.statement.select.OptimizeFor;
 import net.sf.jsqlparser.statement.select.ParenthesedSelectBody;
-import net.sf.jsqlparser.statement.select.ParenthesisFromItem;
+import net.sf.jsqlparser.statement.select.ParenthesedFromItem;
 import net.sf.jsqlparser.statement.select.Pivot;
 import net.sf.jsqlparser.statement.select.PivotVisitor;
 import net.sf.jsqlparser.statement.select.PivotXml;
@@ -595,7 +595,7 @@ public void visit(TableFunction tableFunction) {
     }
 
     @Override
-    public void visit(ParenthesisFromItem parenthesis) {
+    public void visit(ParenthesedFromItem parenthesis) {
         buffer.append("(");
         parenthesis.getFromItem().accept(this);
         List<Join> joins = parenthesis.getJoins();

diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java
@@ -299,7 +299,7 @@ public void visit(TableFunction tableFunction) {
     }
 
     @Override
-    public void visit(ParenthesisFromItem parenthesis) {
+    public void visit(ParenthesedFromItem parenthesis) {
         validateOptional(parenthesis.getFromItem(), e -> e.accept(this));
     }
 

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -2548,7 +2548,7 @@ List<Table> IntoClause():
 
 FromItem ParenthesedFromItem():
 {
-    ParenthesisFromItem parenthesisFromItem = new ParenthesisFromItem();
+    ParenthesedFromItem ParenthesedFromItem = new ParenthesedFromItem();
     FromItem fromItem;
     List<Join> joins = null;
 }
@@ -2559,7 +2559,7 @@ FromItem ParenthesedFromItem():
     ")"
 
     {
-        return parenthesisFromItem.withFromItem(fromItem).withJoins(joins);
+        return ParenthesedFromItem.withFromItem(fromItem).withJoins(joins);
     }
 }
 
@@ -2586,9 +2586,6 @@ FromItem FromItem():
                 |
                 LOOKAHEAD( ParenthesedFromItem() ) fromItem = ParenthesedFromItem()
                 |
-                //@todo: this is a very expenise LOOKAHEAD
-                // which is needed only for Tablenames in many brackets
-                // e. g. SELECT * FROM (((tableName)))
                 LOOKAHEAD(3) (
                     selectBody=ParenthesedSelectBody() { fromItem = new SubSelect().withSelectBody(selectBody).withUseBrackets(false); }
                     [ LOOKAHEAD(2) unpivot=UnPivot() { fromItem.setUnPivot(unpivot); } ]