feat: ParenthesedSelectBody and ParenthesedFromItem

manticore-projects · manticore-projects · commit ad9e98d9d89c · 2023-03-23T08:09:58.000+07:00
- delete unneeded ParenthesedJoin
- rename ParenthesisFromItem into ParenthesedFromItem
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/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedFromItem.java b/src/main/java/net/sf/jsqlparser/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); } ]

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ public interface FromItemVisitor {`
`25`	`25`
`26`	`26`	`void visit(TableFunction tableFunction);`
`27`	`27`
`28`		`- void visit(ParenthesisFromItem aThis);`
	`28`	`+ void visit(ParenthesedFromItem aThis);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public void visit(TableFunction valuesList) {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- public void visit(ParenthesisFromItem aThis) {`
	`48`	`+ public void visit(ParenthesedFromItem aThis) {`
`49`	`49`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -938,7 +938,7 @@ public void visit(UseStatement use) {`
`938`	`938`	`}`
`939`	`939`
`940`	`940`	`@Override`
`941`		`- public void visit(ParenthesisFromItem parenthesis) {`
	`941`	`+ public void visit(ParenthesedFromItem parenthesis) {`
`942`	`942`	`parenthesis.getFromItem().accept(this);`
`943`	`943`	`}`
`944`	`944`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public void visit(TableFunction tableFunction) {`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`@Override`
`302`		`- public void visit(ParenthesisFromItem parenthesis) {`
	`302`	`+ public void visit(ParenthesedFromItem parenthesis) {`
`303`	`303`	`validateOptional(parenthesis.getFromItem(), e -> e.accept(this));`
`304`	`304`	`}`
`305`	`305`
Original file line number	Diff line number	Diff line change
`@@ -2548,7 +2548,7 @@ List<Table> IntoClause():`
`2548`	`2548`
`2549`	`2549`	`FromItem ParenthesedFromItem():`
`2550`	`2550`	`{`
`2551`		`- ParenthesisFromItem parenthesisFromItem = new ParenthesisFromItem();`
	`2551`	`+ ParenthesedFromItem ParenthesedFromItem = new ParenthesedFromItem();`
`2552`	`2552`	`FromItem fromItem;`
`2553`	`2553`	`List<Join> joins = null;`
`2554`	`2554`	`}`
`@@ -2559,7 +2559,7 @@ FromItem ParenthesedFromItem():`
`2559`	`2559`	`")"`
`2560`	`2560`
`2561`	`2561`	`{`
`2562`		`- return parenthesisFromItem.withFromItem(fromItem).withJoins(joins);`
	`2562`	`+ return ParenthesedFromItem.withFromItem(fromItem).withJoins(joins);`
`2563`	`2563`	`}`
`2564`	`2564`	`}`
`2565`	`2565`
`@@ -2586,9 +2586,6 @@ FromItem FromItem():`
`2586`	`2586`	`\|`
`2587`	`2587`	`LOOKAHEAD( ParenthesedFromItem() ) fromItem = ParenthesedFromItem()`
`2588`	`2588`	`\|`
`2589`		`- //@todo: this is a very expenise LOOKAHEAD`
`2590`		`- // which is needed only for Tablenames in many brackets`
`2591`		`- // e. g. SELECT * FROM (((tableName)))`
`2592`	`2589`	`LOOKAHEAD(3) (`
`2593`	`2590`	`selectBody=ParenthesedSelectBody() { fromItem = new SubSelect().withSelectBody(selectBody).withUseBrackets(false); }`
`2594`	`2591`	`[ LOOKAHEAD(2) unpivot=UnPivot() { fromItem.setUnPivot(unpivot); } ]`