feat: AST Node access for FromItem

manticore-projects · manticore-projects · commit c1edf0f8f21b · 2024-04-21T16:01:09.000+07:00
Signed-off-by: Andreas Reichel &lt;andreas@manticore-projects.com&gt;
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItem.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItem.java
@@ -9,10 +9,10 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import net.sf.jsqlparser.Model;
 import net.sf.jsqlparser.expression.Alias;
+import net.sf.jsqlparser.parser.ASTNodeAccess;
 
-public interface FromItem extends Model {
+public interface FromItem extends ASTNodeAccess {
 
     void accept(FromItemVisitor fromItemVisitor);
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedFromItem.java b/src/main/java/net/sf/jsqlparser/statement/select/ParenthesedFromItem.java
@@ -10,13 +10,14 @@
 package net.sf.jsqlparser.statement.select;
 
 import net.sf.jsqlparser.expression.Alias;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-public class ParenthesedFromItem implements FromItem {
+public class ParenthesedFromItem extends ASTNodeAccessImpl implements FromItem {
     private FromItem fromItem;
     private List<Join> joins;
     private Alias alias;
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -2886,7 +2886,7 @@ FromItem ParenthesedFromItem():
     }
 }
 
-FromItem FromItem():
+FromItem FromItem() #FromItem:
 {
     FromItem fromItem = null;
     FromItem fromItem2 = null;
@@ -2934,6 +2934,7 @@ FromItem FromItem():
         )
     ]
     {
+        linkAST(fromItem,jjtThis);
         return fromItem;
     }
 }
@@ -3027,11 +3028,11 @@ Join JoinerExpression() #JoinerExpression:
                         )
                     )
     ]
-  {
-    linkAST(join,jjtThis);
-    join.setFromItem(right);
-  return join;
-}
+    {
+        linkAST(join,jjtThis);
+        join.setFromItem(right);
+        return join;
+    }
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2886,7 +2886,7 @@ FromItem ParenthesedFromItem():`
`2886`	`2886`	`}`
`2887`	`2887`	`}`
`2888`	`2888`
`2889`		`-FromItem FromItem():`
	`2889`	`+FromItem FromItem() #FromItem:`
`2890`	`2890`	`{`
`2891`	`2891`	`FromItem fromItem = null;`
`2892`	`2892`	`FromItem fromItem2 = null;`
`@@ -2934,6 +2934,7 @@ FromItem FromItem():`
`2934`	`2934`	`)`
`2935`	`2935`	`]`
`2936`	`2936`	`{`
	`2937`	`+ linkAST(fromItem,jjtThis);`
`2937`	`2938`	`return fromItem;`
`2938`	`2939`	`}`
`2939`	`2940`	`}`
`@@ -3027,11 +3028,11 @@ Join JoinerExpression() #JoinerExpression:`
`3027`	`3028`	`)`
`3028`	`3029`	`)`
`3029`	`3030`	`]`
`3030`		`- {`
`3031`		`- linkAST(join,jjtThis);`
`3032`		`- join.setFromItem(right);`
`3033`		`- return join;`
`3034`		`-}`
	`3031`	`+ {`
	`3032`	`+ linkAST(join,jjtThis);`
	`3033`	`+ join.setFromItem(right);`
	`3034`	`+ return join;`
	`3035`	`+ }`
`3035`	`3036`
`3036`	`3037`	`}`
`3037`	`3038`