From 58fc796ac54d6c7558447450d1d85c3af0b43f3a Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@gmail.com>
Date: Thu, 29 Oct 2026 02:19:31 +0100
Subject: [PATCH 1/7] fix: give arithmetic expressions an AST node

prattArithRest builds operator expressions in plain Java, outside any
production, so JJTree never opened a node for them and `CURRENT_DATE - 7`
or `a || b` had no source range. Each expression the loop builds is now
linked to a node from the token its operand chain starts at to the last
token consumed. The node stays out of the tree, so the operands' nodes
keep their place.
---
 .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 26 ++++++++++++++++---
 .../statement/select/SelectASTTest.java       | 22 ++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index f2bf3b59cb..d7a4c9a6c8 100644
--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -301,6 +301,18 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
         }
     }
 
+    /**
+     * Links an expression the operator loop builds, which no production opens a node for, to a node
+     * spanning its tokens from {@code first} to the last one consumed. The node is left out of the
+     * tree, so the operands' nodes keep their place in it.
+     */
+    private void linkAST(ASTNodeAccess access, Token first) {
+        Node node = new Node(this, JJTEXPRESSION);
+        node.jjtSetFirstToken(first);
+        node.jjtSetLastToken(getToken(0));
+        linkAST(access, node);
+    }
+
     public Node getASTRoot() {
         return jjtree.rootNode();
     }
@@ -1002,7 +1014,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
         return kind == K_RETURNING || kind == K_ABSENT && getToken(2).kind == K_ON;
     }
 
-        protected Expression prattArithRest(Expression left, int minPrec) throws ParseException {
+        protected Expression prattArithRest(Expression left, Token first, int minPrec) throws ParseException {
         while (!interrupted) {
             Token t = getToken(1);
             int op = t.kind;
@@ -1051,13 +1063,16 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
             if (op == OP_PIPE && getToken(2).kind == OP_PIPE) {
                 jj_consume_token(OP_PIPE, getToken(1).image);
                 jj_consume_token(OP_PIPE, getToken(1).image);
-                Expression right = prattArithRest(PrimaryExpression(), prec + 1);
+                Token rightFirst = getToken(1);
+                Expression right = prattArithRest(PrimaryExpression(), rightFirst, prec + 1);
                 Concat r = new Concat(); r.setLeftExpression(left); r.setRightExpression(right); left = r;
+                linkAST(left, first);
                 continue;
             }
 
             jj_consume_token(op, getToken(1).image);
-            Expression right = prattArithRest(PrimaryExpression(), prec + 1);
+            Token rightFirst = getToken(1);
+            Expression right = prattArithRest(PrimaryExpression(), rightFirst, prec + 1);
 
             if (jsonAccess) {
                 JsonExpression access = left instanceof JsonExpression
@@ -1087,6 +1102,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
                 else if ("&".equals(img)) { BitwiseAnd     r = new BitwiseAnd();     r.setLeftExpression(left); r.setRightExpression(right); left = r; }
                 else if ("<->".equals(img) || "<#>".equals(img)) { GeometryDistance r = new GeometryDistance(img); r.setLeftExpression(left); r.setRightExpression(right); left = r; }
             }
+            linkAST(left, first);
         }
         return left;
     }
@@ -12944,16 +12960,18 @@ Expression SimpleExpression():
     Expression retval = null;
     UserVariable user = null;
     Token operation = null;
+    Token first;
 }
 {
     [ LOOKAHEAD( 5, { getToken(1).kind == S_AT_IDENTIFIER } ) user = UserVariable() ( operation = "=" | operation = ":=" ) ]
+    { first = getToken(1); }
     retval=PrimaryExpression()
     // PostgreSQL path operators bind below arithmetic and above comparisons.
     // MySQL also gives | and & their own tiers below <<, >>, so the loop's
     // entry floor drops to 2 there instead of the shared bitwise level 4.
     {
         int arithFloor = Dialect.MYSQL.name().equals(getAsString(Feature.dialect)) ? 2 : 4;
-        retval = prattArithRest(retval, arithFloor);
+        retval = prattArithRest(retval, first, arithFloor);
     }
     {
         if (user != null) {
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java
index 5fd6a79301..f46c1a2384 100644
--- a/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java
+++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java
@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.parser.ASTNodeAccess;
@@ -203,6 +204,27 @@ public void testBinaryConditionNodeStartsAtItsLeftOperand() throws JSQLParserExc
         }
     }
 
+    @Test
+    public void testOperatorExpressionNodeSpansItsOperands() throws JSQLParserException {
+        String sql = "SELECT a - 1 - 2, 1 + 2 * 3, a | | b FROM t WHERE d > CURRENT_DATE - 7";
+        PlainSelect select = (PlainSelect) CCJSqlParserUtil.parse(sql);
+        BinaryExpression chain = (BinaryExpression) select.getSelectItem(0).getExpression();
+        BinaryExpression precedence = (BinaryExpression) select.getSelectItem(1).getExpression();
+
+        assertEquals("a - 1 - 2", source(sql, chain));
+        assertEquals("a - 1", source(sql, chain.getLeftExpression()));
+        assertEquals("2 * 3", source(sql, precedence.getRightExpression()));
+        assertEquals("a | | b", source(sql, select.getSelectItem(2).getExpression()));
+        assertEquals("CURRENT_DATE - 7",
+                source(sql, ((BinaryExpression) select.getWhere()).getRightExpression()));
+    }
+
+    private static String source(String sql, Expression expression) {
+        Node node = expression.getASTNode();
+        return sql.substring(node.jjtGetFirstToken().absoluteBegin - 1,
+                node.jjtGetLastToken().absoluteEnd - 1);
+    }
+
     @Test
     public void testSelectASTExtractWithCommentsIssue1580() throws JSQLParserException {
         String sql =

From 287ee1806f01254b556c25320db12aed8e08d9d1 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@gmail.com>
Date: Thu, 29 Oct 2026 03:52:16 +0100
Subject: [PATCH 2/7] refactor: let every statement class carry an AST node

The statement classes that implemented Statement alone now extend
ASTNodeAccessImpl, as Select and Import already did, so a parsed
statement can hold the node that records its source range. Nothing
links them yet.
---
 .../java/net/sf/jsqlparser/statement/AssertStatement.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/AttachStatement.java     | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/Block.java          | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/Commit.java         | 4 +++-
 .../java/net/sf/jsqlparser/statement/ConnectStatement.java    | 4 +++-
 src/main/java/net/sf/jsqlparser/statement/CopyStatement.java  | 3 ++-
 .../sf/jsqlparser/statement/CreateFunctionalStatement.java    | 3 ++-
 .../java/net/sf/jsqlparser/statement/DeallocateStatement.java | 4 +++-
 .../java/net/sf/jsqlparser/statement/DeclareStatement.java    | 3 ++-
 .../java/net/sf/jsqlparser/statement/DescribeStatement.java   | 3 ++-
 .../java/net/sf/jsqlparser/statement/DetachStatement.java     | 4 +++-
 .../java/net/sf/jsqlparser/statement/DisconnectStatement.java | 4 +++-
 src/main/java/net/sf/jsqlparser/statement/DoStatement.java    | 3 ++-
 .../java/net/sf/jsqlparser/statement/ExplainStatement.java    | 3 ++-
 .../java/net/sf/jsqlparser/statement/ExtensionStatement.java  | 4 +++-
 .../java/net/sf/jsqlparser/statement/IfElseStatement.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/PragmaStatement.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/PrepareStatement.java    | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java | 3 ++-
 .../sf/jsqlparser/statement/ReleaseSavepointStatement.java    | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/ResetStatement.java | 3 ++-
 .../java/net/sf/jsqlparser/statement/RollbackStatement.java   | 4 +++-
 .../java/net/sf/jsqlparser/statement/SavepointStatement.java  | 3 ++-
 .../java/net/sf/jsqlparser/statement/SessionStatement.java    | 3 ++-
 .../net/sf/jsqlparser/statement/SetDefaultRoleStatement.java  | 3 ++-
 .../sf/jsqlparser/statement/SetIdentityInsertStatement.java   | 3 ++-
 .../net/sf/jsqlparser/statement/SetPasswordStatement.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/SetRoleStatement.java    | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/SetStatement.java   | 3 ++-
 .../net/sf/jsqlparser/statement/ShowColumnsStatement.java     | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/ShowStatement.java  | 4 +++-
 .../java/net/sf/jsqlparser/statement/StartTransaction.java    | 3 ++-
 .../sf/jsqlparser/statement/TableMaintenanceStatement.java    | 3 ++-
 .../net/sf/jsqlparser/statement/UnsupportedStatement.java     | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/UseStatement.java   | 4 +++-
 src/main/java/net/sf/jsqlparser/statement/alter/Alter.java    | 3 ++-
 .../net/sf/jsqlparser/statement/alter/AlterCollation.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterDomain.java   | 3 ++-
 .../net/sf/jsqlparser/statement/alter/AlterEventTrigger.java  | 3 ++-
 .../net/sf/jsqlparser/statement/alter/AlterExtension.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterPolicy.java   | 3 ++-
 .../net/sf/jsqlparser/statement/alter/AlterPublication.java   | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterRelation.java | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterRoutine.java  | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterSession.java  | 3 ++-
 .../net/sf/jsqlparser/statement/alter/AlterStatistics.java    | 3 ++-
 .../net/sf/jsqlparser/statement/alter/AlterSubscription.java  | 3 ++-
 .../sf/jsqlparser/statement/alter/AlterSystemStatement.java   | 3 ++-
 .../net/sf/jsqlparser/statement/alter/AlterTablespace.java    | 3 ++-
 .../sf/jsqlparser/statement/alter/AlterTablespaceMove.java    | 3 ++-
 .../statement/alter/AlterTextSearchConfiguration.java         | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterTrigger.java  | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterType.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/AlterUser.java     | 3 ++-
 .../sf/jsqlparser/statement/alter/RenameTableStatement.java   | 3 ++-
 .../java/net/sf/jsqlparser/statement/alter/RenameUser.java    | 3 ++-
 .../sf/jsqlparser/statement/alter/database/AlterDatabase.java | 3 ++-
 .../net/sf/jsqlparser/statement/alter/schema/AlterSchema.java | 3 ++-
 .../sf/jsqlparser/statement/alter/sequence/AlterSequence.java | 3 ++-
 .../java/net/sf/jsqlparser/statement/analyze/Analyze.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/comment/Comment.java     | 3 ++-
 .../statement/create/accessmethod/CreateAccessMethod.java     | 3 ++-
 .../statement/create/collation/CreateCollation.java           | 3 ++-
 .../jsqlparser/statement/create/database/CreateDatabase.java  | 3 ++-
 .../sf/jsqlparser/statement/create/domain/CreateDomain.java   | 3 ++-
 .../sf/jsqlparser/statement/create/event/EventStatement.java  | 3 ++-
 .../statement/create/extension/CreateExtension.java           | 3 ++-
 .../statement/create/extension/CreateExtensionRepository.java | 3 ++-
 .../net/sf/jsqlparser/statement/create/index/CreateIndex.java | 3 ++-
 .../net/sf/jsqlparser/statement/create/macro/CreateMacro.java | 3 ++-
 .../sf/jsqlparser/statement/create/policy/CreatePolicy.java   | 3 ++-
 .../statement/create/publication/CreatePublication.java       | 3 ++-
 .../net/sf/jsqlparser/statement/create/rule/CreateRule.java   | 3 ++-
 .../sf/jsqlparser/statement/create/schema/CreateSchema.java   | 3 ++-
 .../jsqlparser/statement/create/sequence/CreateSequence.java  | 3 ++-
 .../statement/create/statistics/CreateStatistics.java         | 3 ++-
 .../statement/create/subscription/CreateSubscription.java     | 3 ++-
 .../sf/jsqlparser/statement/create/synonym/CreateSynonym.java | 3 ++-
 .../net/sf/jsqlparser/statement/create/table/CreateTable.java | 3 ++-
 .../statement/create/tablespace/CreateTablespace.java         | 3 ++-
 .../create/textsearch/CreateTextSearchConfiguration.java      | 3 ++-
 .../statement/create/trigger/CreateEventTrigger.java          | 3 ++-
 .../sf/jsqlparser/statement/create/trigger/CreateTrigger.java | 3 ++-
 .../net/sf/jsqlparser/statement/create/type/CreateType.java   | 3 ++-
 .../net/sf/jsqlparser/statement/create/user/CreateUser.java   | 3 ++-
 .../net/sf/jsqlparser/statement/create/view/AlterView.java    | 3 ++-
 .../net/sf/jsqlparser/statement/create/view/CreateView.java   | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/delete/Delete.java  | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/drop/Drop.java      | 3 ++-
 .../java/net/sf/jsqlparser/statement/drop/DropPolicy.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/execute/Execute.java     | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/export/Export.java  | 3 ++-
 .../sf/jsqlparser/statement/export/ExportDataStatement.java   | 3 ++-
 .../sf/jsqlparser/statement/foreign/ForeignDataStatement.java | 3 ++-
 .../sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/grant/Grant.java    | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java   | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/insert/Insert.java  | 3 ++-
 .../java/net/sf/jsqlparser/statement/insert/InsertBulk.java   | 3 ++-
 .../net/sf/jsqlparser/statement/load/LoadDataStatement.java   | 3 ++-
 .../java/net/sf/jsqlparser/statement/lock/LockStatement.java  | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/merge/Merge.java    | 3 ++-
 .../net/sf/jsqlparser/statement/notify/NotifyStatement.java   | 3 ++-
 .../net/sf/jsqlparser/statement/oracle/OracleAssignment.java  | 3 ++-
 .../sf/jsqlparser/statement/oracle/OracleNullStatement.java   | 3 ++-
 .../statement/refresh/RefreshMaterializedViewStatement.java   | 3 ++-
 .../java/net/sf/jsqlparser/statement/reindex/Reindex.java     | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java | 3 ++-
 .../java/net/sf/jsqlparser/statement/role/CreateRole.java     | 3 ++-
 .../java/net/sf/jsqlparser/statement/role/ReassignOwned.java  | 3 ++-
 .../sf/jsqlparser/statement/securitylabel/SecurityLabel.java  | 3 ++-
 .../net/sf/jsqlparser/statement/show/ShowCreateStatement.java | 3 ++-
 .../net/sf/jsqlparser/statement/show/ShowIndexStatement.java  | 3 ++-
 .../jsqlparser/statement/show/ShowTableStatusStatement.java   | 3 ++-
 .../net/sf/jsqlparser/statement/show/ShowTablesStatement.java | 3 ++-
 .../java/net/sf/jsqlparser/statement/truncate/Truncate.java   | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/update/Update.java  | 3 ++-
 src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java  | 3 ++-
 118 files changed, 245 insertions(+), 118 deletions(-)

diff --git a/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java b/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java
index 1e5a742982..58a294bb5f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 import java.util.function.Consumer;
 
@@ -22,7 +23,7 @@
  *      "https://cloud.google.com/bigquery/docs/reference/standard-sql/debugging-statements">Debugging
  *      statements</a>
  */
-public class AssertStatement implements Statement {
+public class AssertStatement extends ASTNodeAccessImpl implements Statement {
     private Expression expression;
     private StringValue description;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java b/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java
index 7ad71dd546..84726280d1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 import java.util.List;
@@ -19,7 +20,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/attach">ATTACH</a>
  */
-public class AttachStatement implements Statement {
+public class AttachStatement extends ASTNodeAccessImpl implements Statement {
     private String databasePath;
     private String alias;
     private boolean usingDatabaseKeyword;
diff --git a/src/main/java/net/sf/jsqlparser/statement/Block.java b/src/main/java/net/sf/jsqlparser/statement/Block.java
index f609e58262..a4e822f01b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/Block.java
+++ b/src/main/java/net/sf/jsqlparser/statement/Block.java
@@ -10,8 +10,9 @@
 package net.sf.jsqlparser.statement;
 
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public class Block implements Statement {
+public class Block extends ASTNodeAccessImpl implements Statement {
     private boolean hasSemicolonAfterEnd = false;
 
     private Statements statements;
diff --git a/src/main/java/net/sf/jsqlparser/statement/Commit.java b/src/main/java/net/sf/jsqlparser/statement/Commit.java
index 20df0a111c..37205308fc 100644
--- a/src/main/java/net/sf/jsqlparser/statement/Commit.java
+++ b/src/main/java/net/sf/jsqlparser/statement/Commit.java
@@ -9,7 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
-public class Commit implements Statement {
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class Commit extends ASTNodeAccessImpl implements Statement {
     private TransactionKeyword keyword;
     private TransactionChain chain;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java b/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java
index a5ae350c64..829410b280 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java
@@ -9,11 +9,13 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's {@code CONNECT target [AS alias]}, which routes the session's queries to a remote
  * database.
  */
-public class ConnectStatement implements Statement {
+public class ConnectStatement extends ASTNodeAccessImpl implements Statement {
     private String target;
     private String alias;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java b/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java
index 0e05b58636..2697677dbb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -25,7 +26,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/copy">COPY</a>
  */
-public class CopyStatement implements Statement {
+public class CopyStatement extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private ExpressionList<Column> columns;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java b/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java
index d3f75a1278..b1978dc4a6 100644
--- a/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java
@@ -15,13 +15,14 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.function.FunctionReturnType;
 import net.sf.jsqlparser.statement.create.table.TableElement;
 
 /**
  * A base for the declaration of function like statements
  */
-public abstract class CreateFunctionalStatement implements Statement {
+public abstract class CreateFunctionalStatement extends ASTNodeAccessImpl implements Statement {
 
     private String kind;
     private boolean orReplace = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java b/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java
index 25d375e38b..58b0fe34cd 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java
@@ -9,10 +9,12 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * {@code DEALLOCATE [PREPARE] name}, which drops a statement prepared by {@link PrepareStatement}.
  */
-public class DeallocateStatement implements Statement {
+public class DeallocateStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean usingPrepareKeyword;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java b/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java
index 27537bc5ff..c189280b54 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java
@@ -18,10 +18,11 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.UserVariable;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
 
-public final class DeclareStatement implements Statement {
+public final class DeclareStatement extends ASTNodeAccessImpl implements Statement {
 
     private UserVariable userVariable = null;
     private DeclareType declareType = DeclareType.TYPE;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java b/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java
index 054b648436..2efedba2d1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java
@@ -9,10 +9,11 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.select.Select;
 
-public class DescribeStatement implements Statement {
+public class DescribeStatement extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java b/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java
index 80fe5780a9..d8bd25f810 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java
@@ -9,12 +9,14 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's {@code DETACH [DATABASE] [IF EXISTS] name}, the counterpart of {@link AttachStatement}.
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/attach">DETACH</a>
  */
-public class DetachStatement implements Statement {
+public class DetachStatement extends ASTNodeAccessImpl implements Statement {
     private String databaseName;
     private boolean usingDatabaseKeyword;
     private boolean ifExists;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java b/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java
index fdbe6f4e71..1231963f67 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java
@@ -9,10 +9,12 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's {@code DISCONNECT [name]}, the counterpart of {@link ConnectStatement}.
  */
-public class DisconnectStatement implements Statement {
+public class DisconnectStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
 
     public DisconnectStatement() {}
diff --git a/src/main/java/net/sf/jsqlparser/statement/DoStatement.java b/src/main/java/net/sf/jsqlparser/statement/DoStatement.java
index c595ea1a32..4f21c91f6a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DoStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DoStatement.java
@@ -11,9 +11,10 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /** A PostgreSQL anonymous routine. The language-specific body remains a string literal. */
-public class DoStatement implements Statement {
+public class DoStatement extends ASTNodeAccessImpl implements Statement {
     private StringValue code;
     private String language;
     private boolean languageBeforeCode;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java b/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java
index 5442ce4c5e..22db6859f9 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java
@@ -14,12 +14,13 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 
 /**
  * An {@code EXPLAIN} statement
  */
-public class ExplainStatement implements Statement {
+public class ExplainStatement extends ASTNodeAccessImpl implements Statement {
     private String keyword;
     private Statement statement;
     private List<Option> options = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java b/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java
index 6219273667..b14282b290 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java
@@ -9,13 +9,15 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's extension management statements {@code [FORCE] INSTALL extension [FROM repository]} and
  * {@code LOAD extension}.
  *
  * @see <a href="https://duckdb.org/docs/stable/extensions/overview">Extensions</a>
  */
-public class ExtensionStatement implements Statement {
+public class ExtensionStatement extends ASTNodeAccessImpl implements Statement {
     private Operation operation;
     private boolean force;
     private String extensionName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java b/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java
index c9e6a6f266..a119702f41 100644
--- a/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java
@@ -14,11 +14,12 @@
 import java.util.function.Consumer;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
  */
-public class IfElseStatement implements Statement {
+public class IfElseStatement extends ASTNodeAccessImpl implements Statement {
     private final Expression condition;
     private final Statement ifStatement;
     private Statement elseStatement;
diff --git a/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java b/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java
index c1692e6df9..f515c6d3d4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * {@code PRAGMA name}, {@code PRAGMA name(arguments)} and {@code PRAGMA name = value}, used by
@@ -18,7 +19,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/configuration/pragmas">PRAGMA statements</a>
  */
-public class PragmaStatement implements Statement {
+public class PragmaStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
     private ExpressionList<?> parameters;
     private Expression value;
diff --git a/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java b/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java
index 6d682deb4e..93d66e4ed4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java
@@ -11,6 +11,7 @@
 
 import java.util.List;
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
@@ -21,7 +22,7 @@
  * @see <a href="https://duckdb.org/docs/stable/sql/query_syntax/prepared_statements">Prepared
  *      statements</a>
  */
-public class PrepareStatement implements Statement {
+public class PrepareStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Statement statement;
     private List<ColDataType> parameterTypes;
diff --git a/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java b/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java
index 2dca9fbab3..a1b1f634a4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java
@@ -12,6 +12,7 @@
 
 import java.util.Objects;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.create.table.Index;
 
@@ -21,7 +22,7 @@
  *      "https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9018.htm">Purge</a>
  */
 
-public class PurgeStatement implements Statement {
+public class PurgeStatement extends ASTNodeAccessImpl implements Statement {
     private final PurgeObjectType purgeObjectType;
     private final Object object;
     private String userName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java b/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java
index 292978382b..794844f75a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java
@@ -10,9 +10,10 @@
 package net.sf.jsqlparser.statement;
 
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /** RELEASE [SAVEPOINT] name. */
-public class ReleaseSavepointStatement implements Statement {
+public class ReleaseSavepointStatement extends ASTNodeAccessImpl implements Statement {
     private String savepointName;
     private boolean usingSavepointKeyword = true;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java b/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java
index dc769a9e8e..6d40879f8f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java
@@ -9,8 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public final class ResetStatement implements Statement {
+public final class ResetStatement extends ASTNodeAccessImpl implements Statement {
 
     private String name = "";
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java b/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java
index d66857fb2c..b12f24edae 100644
--- a/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java
@@ -25,10 +25,12 @@
 
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * @author are
  */
-public class RollbackStatement implements Statement {
+public class RollbackStatement extends ASTNodeAccessImpl implements Statement {
     private TransactionKeyword keyword;
     private TransactionChain chain;
     private boolean usingSavepointKeyword = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java b/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java
index 390c7f438a..519d47d9e4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java
@@ -11,11 +11,12 @@
 package net.sf.jsqlparser.statement;
 
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
  */
-public class SavepointStatement implements Statement {
+public class SavepointStatement extends ASTNodeAccessImpl implements Statement {
     private String savepointName;
 
     public SavepointStatement(String savepointName) {
diff --git a/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java b/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java
index 1c791bb1ac..e1780803ae 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java
@@ -13,8 +13,9 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public class SessionStatement implements Statement {
+public class SessionStatement extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         START, APPLY, DROP, SHOW, DESCRIBE;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java
index 0e0268cde3..95e72b2bc8 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.user.RoleSelection;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 
@@ -22,7 +23,7 @@
  * {@code SET DEFAULT ROLE {role | NONE} [FOR user]} is kept with {@link #isForKeyword()}; without
  * accounts the statement applies to the current user.
  */
-public class SetDefaultRoleStatement implements Statement {
+public class SetDefaultRoleStatement extends ASTNodeAccessImpl implements Statement {
 
     private RoleSelection roles;
     private final List<UserAccount> accounts = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java
index 0c8c925fbb..90eba553a2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java
@@ -11,10 +11,11 @@
 
 import java.util.Objects;
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 
 /** SQL Server SET IDENTITY_INSERT [database.][schema.]table ON | OFF. */
-public final class SetIdentityInsertStatement implements Statement {
+public final class SetIdentityInsertStatement extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private boolean on;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java
index 17125d55f0..4fa23f2ae4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java
@@ -12,6 +12,7 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 
 /**
@@ -19,7 +20,7 @@
  * [REPLACE 'current'] [RETAIN CURRENT PASSWORD]}. The password is an expression, usually a string
  * literal; MariaDB also accepts {@code PASSWORD('...')}.
  */
-public class SetPasswordStatement implements Statement {
+public class SetPasswordStatement extends ASTNodeAccessImpl implements Statement {
 
     private UserAccount account;
     private Expression password;
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java
index 4de3090f82..afc38b8bd1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java
@@ -9,13 +9,14 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.user.RoleSelection;
 
 /**
  * MySQL/MariaDB {@code SET ROLE {DEFAULT | NONE | ALL [EXCEPT role, ...] | role, ...}}. PostgreSQL
  * {@code SET [SESSION | LOCAL] ROLE name} remains a {@link SetStatement}.
  */
-public class SetRoleStatement implements Statement {
+public class SetRoleStatement extends ASTNodeAccessImpl implements Statement {
 
     private RoleSelection roles;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
index a8fb98d58a..ff20a553de 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -20,7 +21,7 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 
-public final class SetStatement implements Statement {
+public final class SetStatement extends ASTNodeAccessImpl implements Statement {
 
     private final List<NameExpr> values = new ArrayList<>();
     private String effectParameter;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java b/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java
index b5ec8324d4..5182afc659 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.show.ShowTablesStatement.SelectionMode;
 
@@ -19,7 +20,7 @@
  *
  * @see <a href="https://dev.mysql.com/doc/refman/8.4/en/show-columns.html">MySQL SHOW COLUMNS</a>
  */
-public class ShowColumnsStatement implements Statement {
+public class ShowColumnsStatement extends ASTNodeAccessImpl implements Statement {
 
     private boolean extended;
     private boolean full;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java b/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java
index c5f1729cc4..c90bdea44e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java
@@ -9,7 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
-public class ShowStatement implements Statement {
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class ShowStatement extends ASTNodeAccessImpl implements Statement {
 
     private String name;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java b/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java
index 78b513d91e..b502be481b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java
+++ b/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java
@@ -12,9 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /** START TRANSACTION, or BEGIN when a transaction dialect is selected. */
-public class StartTransaction implements Statement {
+public class StartTransaction extends ASTNodeAccessImpl implements Statement {
     public enum Command {
         START_TRANSACTION, BEGIN
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java b/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java
index d056b699de..0593a85f82 100644
--- a/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java
@@ -14,13 +14,14 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 
 /**
  * A MySQL/MariaDB {@code CHECK TABLE}, {@code OPTIMIZE TABLE} or {@code REPAIR TABLE} statement.
  * {@code ANALYZE TABLE} remains {@link net.sf.jsqlparser.statement.analyze.Analyze}.
  */
-public class TableMaintenanceStatement implements Statement {
+public class TableMaintenanceStatement extends ASTNodeAccessImpl implements Statement {
 
     public enum Operation {
         CHECK, OPTIMIZE, REPAIR;
diff --git a/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java b/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java
index f64a89fac7..e62cd560a5 100644
--- a/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java
@@ -13,12 +13,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
  */
 
-public class UnsupportedStatement implements Statement {
+public class UnsupportedStatement extends ASTNodeAccessImpl implements Statement {
     private List<String> declarations;
 
     public UnsupportedStatement(List<String> declarations) {
diff --git a/src/main/java/net/sf/jsqlparser/statement/UseStatement.java b/src/main/java/net/sf/jsqlparser/statement/UseStatement.java
index b4b606849f..0d3732bc17 100644
--- a/src/main/java/net/sf/jsqlparser/statement/UseStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/UseStatement.java
@@ -9,7 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
-public class UseStatement implements Statement {
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class UseStatement extends ASTNodeAccessImpl implements Statement {
 
     private String name;
     private boolean schemaKeyword;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java b/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java
index b2183ad915..fa22cae7fb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java
@@ -15,11 +15,12 @@
 import java.util.List;
 import java.util.Optional;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Alter implements Statement {
+public class Alter extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private boolean useOnly = false;
     private boolean useTableIfExists = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java
index fd4bf30fec..0f71760bfa 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java
@@ -9,10 +9,11 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterCollation implements Statement {
+public class AlterCollation extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         REFRESH_VERSION, RENAME, OWNER, SET_SCHEMA
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java
index ca75f8faa6..e8f0efa5d5 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java
@@ -11,12 +11,13 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.create.domain.DomainConstraint;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterDomain implements Statement {
+public class AlterDomain extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private Expression defaultExpression;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java
index 0efb70b9bc..0dba7565f7 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -17,7 +18,7 @@
  * and rule actions of {@link RelationAlterAction}. Each non-null setter selects its action and
  * discards the values of the other actions.
  */
-public class AlterEventTrigger implements Statement {
+public class AlterEventTrigger extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         STATE, OWNER, RENAME
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java
index 0affa5f43e..6414dc03d5 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java
@@ -10,11 +10,12 @@
 package net.sf.jsqlparser.statement.alter;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.extension.ExtensionObject;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterExtension implements Statement {
+public class AlterExtension extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private Expression version;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java
index 6cb23c0860..f0ac1e7c10 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.policy.PolicyOptions;
 
-public class AlterPolicy implements Statement {
+public class AlterPolicy extends ASTNodeAccessImpl implements Statement {
     private String policyName;
     private net.sf.jsqlparser.schema.Table table;
     private String newName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java
index 6216403954..765a3863d2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.publication.PublicationTarget;
 import net.sf.jsqlparser.statement.create.publication.PublicationOption;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterPublication implements Statement {
+public class AlterPublication extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private List<PublicationTarget> targets = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java
index 0c09943e10..6eb2c5c299 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL ALTER INDEX, ALTER VIEW properties and ALTER MATERIALIZED VIEW. */
-public class AlterRelation implements Statement {
+public class AlterRelation extends ASTNodeAccessImpl implements Statement {
     public enum ObjectType {
         INDEX, VIEW, MATERIALIZED_VIEW
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java
index 66f1717cc3..1c2be8454b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java
@@ -14,6 +14,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.RoutineCharacteristic;
 import net.sf.jsqlparser.statement.RoutineReference;
 import net.sf.jsqlparser.statement.Statement;
@@ -27,7 +28,7 @@
  * Server's routine redefinitions remain
  * {@link net.sf.jsqlparser.statement.CreateFunctionalStatement} nodes.
  */
-public class AlterRoutine implements Statement {
+public class AlterRoutine extends ASTNodeAccessImpl implements Statement {
 
     public enum RoutineType {
         FUNCTION, PROCEDURE, ROUTINE
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java
index e7e8308d99..c5e2ea2a63 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java
@@ -12,6 +12,7 @@
 
 import java.util.List;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -20,7 +21,7 @@
  * @see <a href="https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_2012.htm">ALTER
  *      SESSION</a>
  */
-public class AlterSession implements Statement {
+public class AlterSession extends ASTNodeAccessImpl implements Statement {
     private AlterSessionOperation operation;
     private List<String> parameters;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java
index b14f9977b2..53331a1729 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL statistics object metadata; a null target denotes SET STATISTICS DEFAULT. */
-public class AlterStatistics implements Statement {
+public class AlterStatistics extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         RENAME, OWNER, SET_SCHEMA, SET_STATISTICS
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java
index 486ebb2d33..2203425052 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java
@@ -14,11 +14,12 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.subscription.SubscriptionOption;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterSubscription implements Statement {
+public class AlterSubscription extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private StringValue connection;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java
index 40ff46b061..6420f991aa 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -21,7 +22,7 @@
  *      SESSION</a>
  */
 
-public class AlterSystemStatement implements Statement {
+public class AlterSystemStatement extends ASTNodeAccessImpl implements Statement {
     private final AlterSystemOperation operation;
     private final List<String> parameters;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java
index 13a0b2be21..b887e1c508 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java
@@ -17,6 +17,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
@@ -28,7 +29,7 @@
  * {@link Action} selects which properties are rendered. Moving all relations of a tablespace with
  * {@code ALTER TABLE ALL IN TABLESPACE} remains {@link AlterTablespaceMove}.
  */
-public class AlterTablespace implements Statement {
+public class AlterTablespace extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         /** {@code RENAME TO newName}. */
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java
index 789315a311..388b89821b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java
@@ -11,12 +11,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 /** Moves all matching relations from one PostgreSQL tablespace to another. */
-public class AlterTablespaceMove implements Statement {
+public class AlterTablespaceMove extends ASTNodeAccessImpl implements Statement {
     public enum ObjectType {
         TABLE, INDEX, MATERIALIZED_VIEW
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java
index cd7b1bfd48..29c459d019 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java
@@ -9,12 +9,13 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import java.util.ArrayList;
 import java.util.List;
 
-public class AlterTextSearchConfiguration implements Statement {
+public class AlterTextSearchConfiguration extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         ADD_MAPPING, ALTER_MAPPING, REPLACE_MAPPING, DROP_MAPPING, RENAME, OWNER, SET_SCHEMA
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java
index de3be507e7..8290beff90 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -17,7 +18,7 @@
  * PostgreSQL {@code ALTER TRIGGER name ON table}, which renames the trigger or marks it as
  * dependent on an extension. Names retain SQL identifier quoting.
  */
-public class AlterTrigger implements Statement {
+public class AlterTrigger extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         /** {@code RENAME TO}, see {@link #getNewName()}. */
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java
index 25361bbc4d..ba486a89ae 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.create.type.TypeAttribute;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterType implements Statement {
+public class AlterType extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private String newName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java
index b27dfa07bd..04c9805ecb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
@@ -29,7 +30,7 @@
  * {@link UserOptions#getDefaultRoles()}. {@code ALTER USER USER() ...} names the current user with
  * the unquoted account name {@code USER()}, see {@link #isUserFunction()}.
  */
-public class AlterUser implements Statement {
+public class AlterUser extends ASTNodeAccessImpl implements Statement {
 
     private static final String USER_FUNCTION = "USER()";
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java b/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java
index c119d1c4d2..1b4537c513 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java
@@ -16,6 +16,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -25,7 +26,7 @@
  * @see <a href=
  *      "https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9019.htm">Rename</a>
  */
-public class RenameTableStatement implements Statement {
+public class RenameTableStatement extends ASTNodeAccessImpl implements Statement {
     private final LinkedHashMap<Table, Table> tableNames = new LinkedHashMap<>();
 
     private boolean usingTableKeyword = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java b/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java
index 152936b91a..77c694cdd0 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java
@@ -15,12 +15,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 
 /** MySQL {@code RENAME USER old TO new [, old TO new] ...} statement. */
-public class RenameUser implements Statement {
+public class RenameUser extends ASTNodeAccessImpl implements Statement {
 
     private final List<Rename> renames = new ArrayList<>();
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java b/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java
index 540d1fb1c4..c01ab3409f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java
@@ -14,6 +14,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.ConfigurationParameterChange;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -24,7 +25,7 @@
  * options, and a missing name selects the current database. The options use the same
  * {@link DatabaseOption} model as {@code CREATE DATABASE}. Names retain SQL identifier quoting.
  */
-public class AlterDatabase implements Statement {
+public class AlterDatabase extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         /** MySQL options or PostgreSQL {@code [WITH] option ...}, see {@link #getOptions()}. */
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java b/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java
index 44dd63ae8c..f88aa08b82 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.alter.schema;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL schema name or ownership change. Names retain SQL identifier quoting. */
-public class AlterSchema implements Statement {
+public class AlterSchema extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         RENAME, OWNER
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java b/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java
index ccd3a52600..644a8382b1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.alter.sequence;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Sequence;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -16,7 +17,7 @@
 /**
  * An {@code ALTER SEQUENCE} statement
  */
-public class AlterSequence implements Statement {
+public class AlterSequence extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         PARAMETERS, RENAME, OWNER, SET_SCHEMA, SET_LOGGED, SET_UNLOGGED
diff --git a/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java b/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java
index 558de06ad6..4acd7e435c 100644
--- a/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java
+++ b/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java
@@ -14,12 +14,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Analyze implements Statement {
+public class Analyze extends ASTNodeAccessImpl implements Statement {
 
     public enum Modifier {
         NO_WRITE_TO_BINLOG, LOCAL
diff --git a/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java b/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java
index 1a5310be0c..f5f95ac245 100755
--- a/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java
+++ b/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java
@@ -11,12 +11,13 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Comment implements Statement {
+public class Comment extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private Column column;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java b/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java
index 21959d7fe1..feb0086435 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.create.accessmethod;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** A PostgreSQL table or index access method, whose handler names a function, not a table. */
-public class CreateAccessMethod implements Statement {
+public class CreateAccessMethod extends ASTNodeAccessImpl implements Statement {
     public enum Type {
         TABLE, INDEX
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java b/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java
index 2f1b06a1b9..9aa9dcc732 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java
@@ -12,12 +12,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
 
 /** PostgreSQL collation copy or parameter definition, with mutually exclusive forms. */
-public class CreateCollation implements Statement {
+public class CreateCollation extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean ifNotExists;
     private String sourceCollation;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java b/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java
index 76a447fa28..4376ce0757 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -24,7 +25,7 @@
  * PostgreSQL options are typed {@link DatabaseOption}s; other option text is kept as a raw
  * {@link DatabaseOption.Kind#OTHER} option.
  */
-public class CreateDatabase implements Statement {
+public class CreateDatabase extends ASTNodeAccessImpl implements Statement {
 
     private String databaseName;
     private boolean hasIfNotExists = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java b/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java
index 61da30eb1e..f079ca7b7d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java
@@ -13,11 +13,12 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateDomain implements Statement {
+public class CreateDomain extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean useAs;
     private ColDataType dataType;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java b/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java
index bd66e95f22..158dd8c0b6 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java
@@ -10,11 +10,12 @@
 package net.sf.jsqlparser.statement.create.event;
 
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 
 /** Common structured properties of MySQL {@code CREATE EVENT} and {@code ALTER EVENT}. */
-public abstract class EventStatement implements Statement {
+public abstract class EventStatement extends ASTNodeAccessImpl implements Statement {
 
     private Table event;
     private EventSchedule schedule;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java
index bbac3276ed..ea9b25fe39 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java
@@ -12,10 +12,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateExtension implements Statement {
+public class CreateExtension extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean ifNotExists;
     private boolean useWith;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java
index f3b85ccee4..d29ec07d87 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.create.extension;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -17,7 +18,7 @@
  * DuckDB 2.0's {@code CREATE EXTENSION REPOSITORY [IF NOT EXISTS] name [WITH PREFIX prefix]}, which
  * registers a custom repository extensions may be installed from.
  */
-public class CreateExtensionRepository implements Statement {
+public class CreateExtensionRepository extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean ifNotExists;
     private Expression prefix;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java b/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java
index 9e5739ae55..b583654aa2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.index;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
 import net.sf.jsqlparser.statement.create.table.KeyElement;
 import java.util.*;
@@ -18,7 +19,7 @@
 import net.sf.jsqlparser.statement.*;
 import net.sf.jsqlparser.statement.create.table.*;
 
-public class CreateIndex implements Statement {
+public class CreateIndex extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private Index index;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java b/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java
index addf28daa1..7c509a48ee 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.create.macro;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
@@ -36,7 +37,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/create_macro">CREATE MACRO</a>
  */
-public class CreateMacro implements Statement {
+public class CreateMacro extends ASTNodeAccessImpl implements Statement {
     private boolean orReplace;
     private boolean temporary;
     private boolean functionKeyword;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java b/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java
index caf4243594..267c946d95 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.create.policy;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -24,7 +25,7 @@
  * | INSERT | UPDATE | DELETE } ] [ TO { role_name | PUBLIC | CURRENT_ROLE | CURRENT_USER |
  * SESSION_USER } [, ...] ] [ USING ( using_expression ) ] [ WITH CHECK ( check_expression ) ]
  */
-public class CreatePolicy implements Statement {
+public class CreatePolicy extends ASTNodeAccessImpl implements Statement {
 
     private String policyName;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java b/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java
index b749f11d60..5a8433b28d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java
@@ -13,10 +13,11 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreatePublication implements Statement {
+public class CreatePublication extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean allTables;
     private List<PublicationTarget> targets = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java b/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java
index 44e1ef134a..a9984106cb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL rewrite rule whose actions reuse ordinary statement AST nodes. */
-public class CreateRule implements Statement {
+public class CreateRule extends ASTNodeAccessImpl implements Statement {
     public enum Event {
         SELECT, INSERT, UPDATE, DELETE
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java b/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java
index 6e8d2da999..bff382a374 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java
@@ -17,11 +17,12 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.database.DatabaseOption;
 
-public class CreateSchema implements Statement {
+public class CreateSchema extends ASTNodeAccessImpl implements Statement {
 
     private String authorization;
     private String catalogName = null;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java b/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java
index 6c3ed901cd..f005e3b0d1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.sequence;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Sequence;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -16,7 +17,7 @@
 /**
  * A {@code CREATE SEQUENCE} statement
  */
-public class CreateSequence implements Statement {
+public class CreateSequence extends ASTNodeAccessImpl implements Statement {
 
     public enum Persistence {
         TEMP, TEMPORARY, UNLOGGED, LOCAL_TEMP, LOCAL_TEMPORARY, GLOBAL_TEMP, GLOBAL_TEMPORARY
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java b/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java
index 4e9775f70c..df966df81c 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java
@@ -14,12 +14,13 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL extended statistics over columns and parenthesized expressions. */
-public class CreateStatistics implements Statement {
+public class CreateStatistics extends ASTNodeAccessImpl implements Statement {
     public enum Kind {
         NDISTINCT, DEPENDENCIES, MCV
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java b/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java
index 75d193e0e4..b67dda66c1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java
@@ -14,10 +14,11 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateSubscription implements Statement {
+public class CreateSubscription extends ASTNodeAccessImpl implements Statement {
     private String name;
     private StringValue connection;
     private List<String> publications = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java b/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java
index ac7eb2640b..9411ba577b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.synonym;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Synonym;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -16,7 +17,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class CreateSynonym implements Statement {
+public class CreateSynonym extends ASTNodeAccessImpl implements Statement {
 
     public Synonym synonym;
     private boolean orReplace;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java b/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
index 38215b5dc2..ed0d930097 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
@@ -16,6 +16,7 @@
 import java.util.Optional;
 
 import net.sf.jsqlparser.expression.SpannerInterleaveIn;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.LikeClause;
@@ -23,7 +24,7 @@
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 
-public class CreateTable implements Statement {
+public class CreateTable extends ASTNodeAccessImpl implements Statement {
 
     private boolean tableOptionsAfterPartition;
     private net.sf.jsqlparser.statement.execute.Execute execute;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java b/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java
index a743055a60..45901d661e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java
@@ -18,6 +18,7 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
@@ -29,7 +30,7 @@
  * options. MySQL options reuse the {@link TableOption} models of the same name, plus
  * {@link TableOption.Kind#FILE_BLOCK_SIZE}.
  */
-public class CreateTablespace implements Statement {
+public class CreateTablespace extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean undo;
     private String owner;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java b/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java
index dbca5ef669..ae214768bd 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java
@@ -9,10 +9,11 @@
  */
 package net.sf.jsqlparser.statement.create.textsearch;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateTextSearchConfiguration implements Statement {
+public class CreateTextSearchConfiguration extends ASTNodeAccessImpl implements Statement {
     public enum SourceKind {
         PARSER, COPY
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java
index daa1ace7c9..13f0e5b09a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java
@@ -18,6 +18,7 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -27,7 +28,7 @@
  * invoked like a {@link CreateTrigger} routine, with the same {@code FUNCTION} or {@code PROCEDURE}
  * spelling, but never takes arguments.
  */
-public class CreateEventTrigger implements Statement {
+public class CreateEventTrigger extends ASTNodeAccessImpl implements Statement {
 
     private String name;
     private String event;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java
index ce48fdf0d1..bcda2c8f59 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java
@@ -14,13 +14,14 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ConstraintAttributes;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** MySQL and PostgreSQL trigger definitions with distinct body and routine-invocation forms. */
-public class CreateTrigger implements Statement {
+public class CreateTrigger extends ASTNodeAccessImpl implements Statement {
 
     public enum Timing {
         BEFORE, AFTER, INSTEAD_OF
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java b/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java
index 891c5bdb0c..4d84bbd229 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java
@@ -10,10 +10,11 @@
 package net.sf.jsqlparser.statement.create.type;
 
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateType implements Statement {
+public class CreateType extends ASTNodeAccessImpl implements Statement {
     private String name;
     private TypeDefinition definition;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java b/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java
index c08e342a82..480500d2c2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -22,7 +23,7 @@
  * {@link UserOptions} after the account list are shared with
  * {@link net.sf.jsqlparser.statement.alter.AlterUser}.
  */
-public class CreateUser implements Statement {
+public class CreateUser extends ASTNodeAccessImpl implements Statement {
 
     private boolean ifNotExists;
     private final List<UserAccount> accounts = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java b/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java
index 1ede9e8f13..44430df573 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.view;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -21,7 +22,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public class AlterView implements Statement {
+public class AlterView extends ASTNodeAccessImpl implements Statement {
 
     private MySqlViewOptions mySqlOptions;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java b/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java
index 8727b6be04..72e83f546d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java
@@ -13,6 +13,7 @@
 import java.util.List;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
@@ -21,7 +22,7 @@
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 
-public class CreateView implements Statement {
+public class CreateView extends ASTNodeAccessImpl implements Statement {
 
     private MySqlViewOptions mySqlOptions;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java b/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java
index 46745d4df2..c988eaf70b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java
+++ b/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java
@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.PreferringClause;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.ForPortionClause;
 import net.sf.jsqlparser.statement.OutputClause;
@@ -36,7 +37,7 @@
 
 import static java.util.stream.Collectors.joining;
 
-public class Delete implements Statement {
+public class Delete extends ASTNodeAccessImpl implements Statement {
 
     private List<WithItem<?>> withItemsList;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
index 9cefb47d1b..7141c9fdd9 100644
--- a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
+++ b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
@@ -19,6 +19,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.RoutineReference;
@@ -28,7 +29,7 @@
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
-public class Drop implements Statement {
+public class Drop extends ASTNodeAccessImpl implements Statement {
 
     public enum ObjectType {
         DATABASE, EVENT, FUNCTION, INDEX, PROCEDURE, SCHEMA, SEQUENCE, SERVER, TABLE, TABLESPACE, TRIGGER, VIEW, FOREIGN_TABLE, AGGREGATE, DOMAIN, EVENT_TRIGGER, GROUP, OWNED, ROLE, ROUTINE, RULE, TYPE, USER, SYNONYM, OTHER;
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java b/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java
index 41f8f01b0b..c276d7e4fc 100644
--- a/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java
+++ b/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.drop;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class DropPolicy implements Statement {
+public class DropPolicy extends ASTNodeAccessImpl implements Statement {
     private String policyName;
     private net.sf.jsqlparser.schema.Table table;
     private boolean ifExists = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java b/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java
index cb2d8439f4..cde107b66e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java
+++ b/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java
@@ -15,12 +15,13 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 import java.util.List;
 
-public class Execute implements Statement {
+public class Execute extends ASTNodeAccessImpl implements Statement {
 
     private ExecType execType = ExecType.EXECUTE;
     private String name;
diff --git a/src/main/java/net/sf/jsqlparser/statement/export/Export.java b/src/main/java/net/sf/jsqlparser/statement/export/Export.java
index dd6628a20e..2c6934270b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/export/Export.java
+++ b/src/main/java/net/sf/jsqlparser/statement/export/Export.java
@@ -10,13 +10,14 @@
 package net.sf.jsqlparser.statement.export;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.*;
 
-public class Export implements Statement {
+public class Export extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private ExpressionList<Column> columns;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java b/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java
index 512ad0a843..1ea8e8074a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.Select;
@@ -24,7 +25,7 @@
  *      "https://cloud.google.com/bigquery/docs/reference/standard-sql/export-statements">Export
  *      statements</a>
  */
-public class ExportDataStatement implements Statement {
+public class ExportDataStatement extends ASTNodeAccessImpl implements Statement {
     private String connectionName;
     private ExpressionList<Expression> options;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java b/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java
index b97afa7091..2ea9cfedf9 100644
--- a/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java
@@ -12,11 +12,12 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.create.table.ForeignDataOption;
 
 /** Shared structured options for PostgreSQL foreign-data DDL. */
-public abstract class ForeignDataStatement implements Statement {
+public abstract class ForeignDataStatement extends ASTNodeAccessImpl implements Statement {
     private List<ForeignDataOption> options;
 
     public List<ForeignDataOption> getOptions() {
diff --git a/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java b/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java
index 42003ceee8..c726c1a843 100644
--- a/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java
+++ b/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java
@@ -12,10 +12,11 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterDefaultPrivileges implements Statement {
+public class AlterDefaultPrivileges extends ASTNodeAccessImpl implements Statement {
     public enum RoleKeyword {
         ROLE, USER
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java b/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java
index 3962e967d6..ab28a2cbfc 100644
--- a/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java
+++ b/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java
@@ -17,11 +17,12 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.RoleSelection;
 
-public class Grant implements Statement {
+public class Grant extends ASTNodeAccessImpl implements Statement {
     private PrivilegeClause clause = new PrivilegeClause();
     private final List<GrantOption> options = new ArrayList<>();
     private Grantee asUser;
diff --git a/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java b/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java
index 620827f582..577ebdd52e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java
+++ b/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java
@@ -11,11 +11,12 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Revoke implements Statement {
+public class Revoke extends ASTNodeAccessImpl implements Statement {
     private PrivilegeClause clause = new PrivilegeClause();
     private boolean ifExists;
     private GrantOption.Kind optionFor;
diff --git a/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java b/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
index 3541c1022f..7d32939f01 100644
--- a/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
+++ b/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
@@ -17,6 +17,7 @@
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Partition;
 import net.sf.jsqlparser.schema.Table;
@@ -32,7 +33,7 @@
 import net.sf.jsqlparser.statement.update.UpdateSet;
 
 @SuppressWarnings({"PMD.CyclomaticComplexity"})
-public class Insert implements Statement {
+public class Insert extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private OracleHint oracleHint = null;
diff --git a/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java b/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java
index 8464a4fa99..c0fa0d4430 100644
--- a/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java
+++ b/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -20,7 +21,7 @@
 import net.sf.jsqlparser.statement.select.OrderByElement;
 
 /** SQL Server's SQL declaration preceding a separate bulk-load data stream. */
-public class InsertBulk implements Statement {
+public class InsertBulk extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private List<ColumnDefinition> columns = new ArrayList<>();
     private List<Option> options = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java b/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java
index 3e04159f1e..16c8a42b0f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.load;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -26,7 +27,7 @@
  *      "https://cloud.google.com/bigquery/docs/reference/standard-sql/load-statements">Load
  *      statements</a>
  */
-public class LoadDataStatement implements Statement {
+public class LoadDataStatement extends ASTNodeAccessImpl implements Statement {
     private boolean overwrite;
     private Table table;
     private List<ColumnDefinition> columnDefinitions;
diff --git a/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java b/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java
index e7a592c3db..e72c259f06 100644
--- a/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java
@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -22,7 +23,7 @@
  * LOCK TABLE t IN EXCLUSIVE MODE<br>
  * <br>
  */
-public class LockStatement implements Statement {
+public class LockStatement extends ASTNodeAccessImpl implements Statement {
 
     private final List<Target> targets = new ArrayList<>();
     private boolean useTableKeyword = true;
diff --git a/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java b/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java
index 10b0123d38..e047de72c0 100644
--- a/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java
+++ b/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java
@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.OutputClause;
 import net.sf.jsqlparser.statement.ReturningClause;
@@ -30,7 +31,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class Merge implements Statement {
+public class Merge extends ASTNodeAccessImpl implements Statement {
 
     private List<WithItem<?>> withItemsList;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java b/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java
index ff8e6dcc1e..27a2b77510 100644
--- a/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java
@@ -12,11 +12,12 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL NOTIFY, usable independently and in CREATE RULE actions. */
-public class NotifyStatement implements Statement {
+public class NotifyStatement extends ASTNodeAccessImpl implements Statement {
     private String channel;
     private StringValue payload;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java
index 857df3245f..42647c1e26 100644
--- a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java
+++ b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java
@@ -11,11 +11,12 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** Assignment to an Oracle block variable, record field or bind parameter. */
-public class OracleAssignment implements Statement {
+public class OracleAssignment extends ASTNodeAccessImpl implements Statement {
     private Expression target;
     private Expression value;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java
index 9d73405fbb..8e8c6cfbee 100644
--- a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.oracle;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** A PL/SQL NULL statement, which deliberately performs no action. */
-public class OracleNullStatement implements Statement {
+public class OracleNullStatement extends ASTNodeAccessImpl implements Statement {
     @Override
     public <T, S> T accept(StatementVisitor<T> visitor, S context) {
         return visitor.visit(this, context);
diff --git a/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java b/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java
index ee3d2c44c2..849156e89f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.refresh;
 
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -22,7 +23,7 @@
  * @author jxnu-liguobin
  */
 
-public class RefreshMaterializedViewStatement implements Statement {
+public class RefreshMaterializedViewStatement extends ASTNodeAccessImpl implements Statement {
 
     private Table view;
     private RefreshMode refreshMode;
diff --git a/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java b/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java
index 5402be1d84..29d5a179f9 100644
--- a/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java
+++ b/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java
@@ -15,12 +15,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** A PostgreSQL {@code REINDEX} statement. */
-public class Reindex implements Statement {
+public class Reindex extends ASTNodeAccessImpl implements Statement {
 
     public enum Target {
         INDEX, TABLE, SCHEMA, DATABASE, SYSTEM
diff --git a/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java b/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java
index 27b4527825..040552d8a1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java
+++ b/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java
@@ -14,6 +14,7 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.ConfigurationParameterChange;
 import net.sf.jsqlparser.statement.ConfigurationParameterChange.ValueKind;
 import net.sf.jsqlparser.statement.Statement;
@@ -24,7 +25,7 @@
  * {@code RESET} actions use the shared {@link ConfigurationParameterChange}; the parameter
  * accessors of this class read and edit that change.
  */
-public class AlterRole implements Statement {
+public class AlterRole extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         OPTIONS, RENAME, SET, RESET, ADD_USER, DROP_USER
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java b/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java
index 13a557b865..2bf56d1a72 100644
--- a/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java
+++ b/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java
@@ -16,6 +16,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
@@ -25,7 +26,7 @@
  * MySQL's {@code CREATE ROLE [IF NOT EXISTS] role [, role] ...} keeps its account-style role names
  * in {@link #getRoles()} instead of {@link #getName()}.
  */
-public class CreateRole implements Statement {
+public class CreateRole extends ASTNodeAccessImpl implements Statement {
     public enum Command {
         ROLE, USER, GROUP
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java b/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java
index 2ca93b73b1..906cd649a7 100644
--- a/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java
+++ b/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
@@ -22,7 +23,7 @@
  * PostgreSQL {@code REASSIGN OWNED BY old_role [, ...] TO new_role}. Roles use the same name model
  * as the roles of {@code DROP OWNED BY}.
  */
-public class ReassignOwned implements Statement {
+public class ReassignOwned extends ASTNodeAccessImpl implements Statement {
     private final List<UserAccount> roles = new ArrayList<>();
     private UserAccount newRole;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java b/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java
index cc0b37592e..8d4988fd7a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java
+++ b/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java
@@ -13,6 +13,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.RoutineReference;
@@ -25,7 +26,7 @@
  * selects its object type and discards the previous target. A null label stands for
  * {@code IS NULL}, which removes the label.
  */
-public class SecurityLabel implements Statement {
+public class SecurityLabel extends ASTNodeAccessImpl implements Statement {
 
     public enum ObjectType {
         TABLE, COLUMN, AGGREGATE, DATABASE, DOMAIN, EVENT_TRIGGER, FOREIGN_TABLE, FUNCTION, LANGUAGE, LARGE_OBJECT, MATERIALIZED_VIEW, PROCEDURE, PUBLICATION, ROLE, ROUTINE, SCHEMA, SEQUENCE, SUBSCRIPTION, TABLESPACE, TYPE, VIEW;
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java
index fa36ea1717..d124fc2301 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.show;
 
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -30,7 +31,7 @@
  * @see <a href="https://dev.mysql.com/doc/refman/8.4/en/show-create-table.html">MySQL SHOW CREATE
  *      TABLE</a>
  */
-public class ShowCreateStatement implements Statement {
+public class ShowCreateStatement extends ASTNodeAccessImpl implements Statement {
 
     public enum ObjectType {
         TABLE, VIEW, PROCEDURE, FUNCTION, TRIGGER, EVENT, DATABASE, USER;
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java
index d6b4bf72d8..3c9b10072d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.show;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -16,7 +17,7 @@
  * @author Jayant Kumar Yadav
  */
 
-public class ShowIndexStatement implements Statement {
+public class ShowIndexStatement extends ASTNodeAccessImpl implements Statement {
 
     private String tableName;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java
index d9a2385e84..a5126cf7ca 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.show;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.show.ShowTablesStatement.SelectionMode;
@@ -20,7 +21,7 @@
  * @see <a href="https://dev.mysql.com/doc/refman/8.4/en/show-table-status.html">MySQL SHOW TABLE
  *      STATUS</a>
  */
-public class ShowTableStatusStatement implements Statement {
+public class ShowTableStatusStatement extends ASTNodeAccessImpl implements Statement {
 
     private SelectionMode selectionMode = SelectionMode.FROM;
     private String dbName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java
index d6016d7fb9..7dbb97b479 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java
@@ -11,6 +11,7 @@
 
 import java.util.Locale;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -21,7 +22,7 @@
  *
  * @see <a href="https://dev.mysql.com/doc/refman/8.0/en/show-tables.html">MySQL show tables</a>
  */
-public class ShowTablesStatement implements Statement {
+public class ShowTablesStatement extends ASTNodeAccessImpl implements Statement {
 
     private EnumSet<Modifiers> modifiers;
     private SelectionMode selectionMode;
diff --git a/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java b/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java
index 81fc5cdddd..a046c7fce1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java
+++ b/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java
@@ -12,13 +12,14 @@
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.List;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.schema.TableReference;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Truncate implements Statement {
+public class Truncate extends ASTNodeAccessImpl implements Statement {
     public enum IdentityOption {
         RESTART, CONTINUE
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/update/Update.java b/src/main/java/net/sf/jsqlparser/statement/update/Update.java
index 8e17df515a..6351832276 100644
--- a/src/main/java/net/sf/jsqlparser/statement/update/Update.java
+++ b/src/main/java/net/sf/jsqlparser/statement/update/Update.java
@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.PreferringClause;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.ForPortionClause;
@@ -37,7 +38,7 @@
 import java.util.Optional;
 
 @SuppressWarnings({"PMD.CyclomaticComplexity"})
-public class Update implements Statement {
+public class Update extends ASTNodeAccessImpl implements Statement {
 
     private List<WithItem<?>> withItemsList;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java b/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java
index c13397569d..f4a0492363 100644
--- a/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java
+++ b/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.upsert;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
@@ -27,7 +28,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public class Upsert implements Statement {
+public class Upsert extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private ExpressionList<Column> columns;

From 4702549c9b1036ca2e3aab58df094c5dbeaf371c Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@gmail.com>
Date: Thu, 29 Oct 2026 03:52:17 +0100
Subject: [PATCH 3/7] fix: give every parsed object a node spanning its source

Objects no grammar rule opens a node for, such as a column's table
qualifier, a WHEN clause, nested AND/OR, IS NULL, BETWEEN, parameter
lists, data types, ORDER BY elements and statements, are linked to a
RangeNode: a node outside the parse tree that records the object's first
and last token. getASTRoot() returns the same tree, and no tree node
gains or changes its value.

Ranges that missed text their object prints now cover it: a statement's
WITH, Oracle PRIOR and (+), LIMIT ... BY, sequence options, IF ... ELSE
and merged adjacent literals. A string literal no longer takes the node
of the primary expression around it. Comments get positions, so an
Oracle hint has a range too. getParent() returns null instead of
throwing once it runs out of tree.

ASTNodeCoverageTest parses the test resources' SQL and requires every
ASTNodeAccess object to have a node of at least one character, inside
its holder's range, never partly overlapping another, holding no
parser, and, for expressions and statements, covering text that parses
back to the same object.
---
 .../jsqlparser/parser/ASTNodeAccessImpl.java  |  18 +-
 .../net/sf/jsqlparser/parser/RangeNode.java   |  31 +
 .../jsqlparser/parser/SimpleCharStream.java   |  32 +
 .../statement/create/table/ColDataType.java   |   4 +-
 .../statement/select/OrderByElement.java      |   5 +-
 .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 641 +++++++++++++-----
 .../parser/ASTNodeCoverageTest.java           | 327 +++++++++
 7 files changed, 874 insertions(+), 184 deletions(-)
 create mode 100644 src/main/java/net/sf/jsqlparser/parser/RangeNode.java
 create mode 100644 src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java

diff --git a/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java b/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java
index 983f99711d..3a1ad53294 100644
--- a/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java
+++ b/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java
@@ -71,22 +71,20 @@ public StringBuilder appendTo(StringBuilder builder) {
         return builder;
     }
 
+    /**
+     * The nearest enclosing object in the tree, or null when there is none. A node that carries
+     * only a token range, for an object no grammar rule opens a tree node for, has no parent.
+     */
     public ASTNodeAccess getParent() {
-        Node parent = (Node) node.jjtGetParent();
-        while (parent.jjtGetValue() == null) {
-            parent = (Node) parent.jjtGetParent();
-        }
-
-        return ASTNodeAccess.class.cast(parent.jjtGetValue());
+        return getParent(ASTNodeAccess.class);
     }
 
     public <T extends ASTNodeAccess> T getParent(Class<T> clazz) {
-        Node parent = (Node) node.jjtGetParent();
-        while (parent.jjtGetValue() == null || !clazz.isInstance(parent.jjtGetValue())) {
+        Node parent = node == null ? null : (Node) node.jjtGetParent();
+        while (parent != null && !clazz.isInstance(parent.jjtGetValue())) {
             parent = (Node) parent.jjtGetParent();
         }
-
-        return clazz.cast(parent.jjtGetValue());
+        return parent == null ? null : clazz.cast(parent.jjtGetValue());
     }
 
     @Override
diff --git a/src/main/java/net/sf/jsqlparser/parser/RangeNode.java b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
new file mode 100644
index 0000000000..909148fc87
--- /dev/null
+++ b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
@@ -0,0 +1,31 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2026 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.parser;
+
+/**
+ * A node outside the parse tree that records the tokens an object spans. It serves an object no
+ * grammar rule opens a tree node for, or one whose text runs past its tree node. In that second
+ * case it answers the tree node's parent, which the object's {@code getParent()} then reports.
+ */
+public final class RangeNode extends Node {
+    private final Node treeNode;
+
+    public RangeNode(Token first, Token last, Node treeNode) {
+        super(CCJSqlParserTreeConstants.JJTEXPRESSION);
+        this.treeNode = treeNode;
+        jjtSetFirstToken(first);
+        jjtSetLastToken(last);
+    }
+
+    @Override
+    public Node jjtGetParent() {
+        return treeNode == null ? null : treeNode.jjtGetParent();
+    }
+}
diff --git a/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java b/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
index 7530045e57..7a7dd60a78 100644
--- a/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
+++ b/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
@@ -48,6 +48,9 @@ public class SimpleCharStream {
     protected boolean trackLineColumn = true;
     protected int totalCharsRead = 0;
     protected int absoluteTokenBegin = 0;
+    // line, column and absolute position of each match begun since the last forgetMatchBegins()
+    private int[] matchBegins = new int[24];
+    private int matchBeginCount = 0;
     int bufsize;
     int available;
     int tokenBegin;
@@ -107,6 +110,33 @@ public final int getAbsoluteTokenBegin() {
         return absoluteTokenBegin;
     }
 
+    /**
+     * The absolute position of the match that began at the given line and column since the last
+     * {@link #forgetMatchBegins()}, or 0 when none did. Lets a comment, which no token action sees,
+     * take its position from where its match began.
+     */
+    public final int getAbsoluteBegin(int line, int column) {
+        for (int i = 0; i < matchBeginCount; i += 3) {
+            if (matchBegins[i] == line && matchBegins[i + 1] == column) {
+                return matchBegins[i + 2];
+            }
+        }
+        return 0;
+    }
+
+    public final void forgetMatchBegins() {
+        matchBeginCount = 0;
+    }
+
+    private void recordMatchBegin() {
+        if (matchBeginCount + 3 > matchBegins.length) {
+            matchBegins = java.util.Arrays.copyOf(matchBegins, matchBegins.length * 2);
+        }
+        matchBegins[matchBeginCount++] = getBeginLine();
+        matchBegins[matchBeginCount++] = getBeginColumn();
+        matchBegins[matchBeginCount++] = absoluteTokenBegin;
+    }
+
     protected void ExpandBuff(boolean wrapAround) {
         final int newSize = bufsize * 2;
         char[] newbuffer = new char[newSize];
@@ -200,6 +230,7 @@ public final char BeginToken() throws java.io.IOException {
         tokenBegin = bufpos;
 
         absoluteTokenBegin = totalCharsRead;
+        recordMatchBegin();
 
         if (c == '#' && featureConfiguration != null
                 && featureConfiguration.getAsBoolean(Feature.allowHashLineComments)) {
@@ -441,6 +472,7 @@ public final void backup(int amount) {
      * Reinitialise.
      */
     public void ReInit(Provider dstream, int startline, int startcolumn, int buffersize) {
+        matchBeginCount = 0;
         inputStream = dstream;
         line = startline;
         column = startcolumn - 1;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java b/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java
index 89f3d60b76..098cdd45db 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java
@@ -10,9 +10,9 @@
 package net.sf.jsqlparser.statement.create.table;
 
 import net.sf.jsqlparser.expression.IntervalQualifier;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
-import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,7 +23,7 @@
 
 import static java.util.stream.Collectors.joining;
 
-public class ColDataType implements Serializable {
+public class ColDataType extends ASTNodeAccessImpl {
 
     public enum Signedness {
         SIGNED, UNSIGNED
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java b/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java
index 4662150fa5..f412066c83 100644
--- a/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java
@@ -9,12 +9,11 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import java.io.Serializable;
-
 import java.util.Locale;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public class OrderByElement implements Serializable {
+public class OrderByElement extends ASTNodeAccessImpl {
 
     private Expression expression;
     // postgres rollup is an ExpressionList
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index d7a4c9a6c8..cbd2cdd6c4 100644
--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -293,24 +293,87 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
      */
     private void linkAST(ASTNodeAccess access, Node node, Expression leftExpression) {
         linkAST(access, node);
-        if (leftExpression instanceof ASTNodeAccess) {
-            Node leftNode = ((ASTNodeAccess) leftExpression).getASTNode();
-            if (leftNode != null && leftNode.jjtGetFirstToken() != null) {
-                node.jjtSetFirstToken(leftNode.jjtGetFirstToken());
+        node.jjtSetFirstToken(firstToken(leftExpression, node.jjtGetFirstToken()));
+    }
+
+    /**
+     * Links an object no production opens a node for to a {@link RangeNode} spanning its tokens
+     * from {@code first} to the last one consumed.
+     */
+    private void linkAST(ASTNodeAccess access, Token first) {
+        linkAST(access, first, getToken(0));
+    }
+
+    private void linkAST(ASTNodeAccess access, Token first, Token last) {
+        linkAST(access, new RangeNode(first, last, null));
+    }
+
+    private static Token firstToken(ASTNodeAccess operand, Token fallback) {
+        Node node = operand == null ? null : operand.getASTNode();
+        return node != null && node.jjtGetFirstToken() != null ? node.jjtGetFirstToken() : fallback;
+    }
+
+    /** Links a list the grammar assembles itself to the range from its first element to its last. */
+    private <T extends ExpressionList<?>> T linkElements(T list) {
+        if (list != null && !list.isEmpty() && list.getASTNode() == null) {
+            Node first = list.get(0).getASTNode();
+            Node last = list.get(list.size() - 1).getASTNode();
+            if (first != null && last != null) {
+                linkAST(list, first.jjtGetFirstToken(), last.jjtGetLastToken());
             }
         }
+        return list;
+    }
+
+    /** Links an object built from the single token just consumed, such as a name, to that token. */
+    private <T extends ASTNodeAccess> T linkToLastToken(T access) {
+        linkAST(access, getToken(0), getToken(0));
+        return access;
+    }
+
+    private <T extends ASTNodeAccess> T linked(T access, Token first) {
+        linkAST(access, first);
+        return access;
     }
 
     /**
-     * Links an expression the operator loop builds, which no production opens a node for, to a node
-     * spanning its tokens from {@code first} to the last one consumed. The node is left out of the
-     * tree, so the operands' nodes keep their place in it.
+     * Widens an object's range to text it has taken in beyond its node, from {@code first} or to
+     * {@code last} where given. A tree node keeps its own range, and the object moves to a
+     * {@link RangeNode} over the wider one.
      */
-    private void linkAST(ASTNodeAccess access, Token first) {
-        Node node = new Node(this, JJTEXPRESSION);
-        node.jjtSetFirstToken(first);
-        node.jjtSetLastToken(getToken(0));
-        linkAST(access, node);
+    private void widen(Object access, Token first, Token last) {
+        Node node = access instanceof ASTNodeAccess ? ((ASTNodeAccess) access).getASTNode() : null;
+        if (node == null) {
+            return;
+        }
+        Token from = first != null ? first : node.jjtGetFirstToken();
+        Token to = last != null ? last : node.jjtGetLastToken();
+        if (node instanceof RangeNode) {
+            node.jjtSetFirstToken(from);
+            node.jjtSetLastToken(to);
+        } else {
+            linkAST((ASTNodeAccess) access, new RangeNode(from, to, node));
+        }
+    }
+
+    /**
+     * The last token of the qualifier in a dotted name running from {@code first} to {@code name},
+     * which is the token two before {@code name}. Null when the name has no qualifier.
+     */
+    private static Token qualifierLast(Token first, Token name) {
+        for (Token token = first; token != null && token != name; token = token.next) {
+            if (token.next != null && token.next.next == name) {
+                return token;
+            }
+        }
+        return null;
+    }
+
+    /** Like {@link #linkAST(ASTNodeAccess, Token)}, for an object a production may already have linked. */
+    private void linkASTIfMissing(ASTNodeAccess access, Token first) {
+        if (access != null && access.getASTNode() == null) {
+            linkAST(access, first);
+        }
     }
 
     public Node getASTRoot() {
@@ -947,7 +1010,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
      * Handles OR (prec=2), XOR (prec=3 under MySQL, else 2), AND/&& (prec=4).
      * Safe to use now that no syntactic production LOOKAHEADs scan through expressions.
      */
-    protected Expression prattExpressionRest(Expression left, int minPrec) throws ParseException {
+    protected Expression prattExpressionRest(Expression left, Token first, int minPrec) throws ParseException {
         while (!interrupted) {
             Token t = getToken(1);
             int op = t.kind;
@@ -970,7 +1033,8 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
                 Expression thenExpression;
                 ternaryThenBranchDepth++;
                 try {
-                    thenExpression = prattExpressionRest(Condition(), 2);
+                    Token thenFirst = getToken(1);
+                    thenExpression = prattExpressionRest(Condition(), thenFirst, 2);
                 } finally {
                     ternaryThenBranchDepth--;
                 }
@@ -978,13 +1042,16 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
                     throw new ParseException("Expected ':' closing the ternary conditional operator");
                 }
                 jj_consume_token(getToken(1).kind, getToken(1).image);
-                Expression elseExpression = prattExpressionRest(Condition(), 2);
+                Token elseFirst = getToken(1);
+                Expression elseExpression = prattExpressionRest(Condition(), elseFirst, 2);
                 left = new TernaryExpression(left, thenExpression, elseExpression);
+                linkAST(left, first);
                 continue;
             }
             jj_consume_token(op, getToken(1).image);
             // +1 makes OR/AND/XOR left-associative
-            Expression right = prattExpressionRest(Condition(), prec + 1);
+            Token rightFirst = getToken(1);
+            Expression right = prattExpressionRest(Condition(), rightFirst, prec + 1);
             if (op == K_AND) {
                 left = new AndExpression(left, right);
             } else if (op == OP_DOUBLEAND) {
@@ -995,6 +1062,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
             } else {
                 left = new OrExpression(left, right);
             }
+            linkAST(left, first);
         }
         return left;
     }
@@ -1073,6 +1141,8 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
             jj_consume_token(op, getToken(1).image);
             Token rightFirst = getToken(1);
             Expression right = prattArithRest(PrimaryExpression(), rightFirst, prec + 1);
+            // a JSON access chain extends the JsonExpression it started, which already has a node
+            boolean extended = jsonAccess && left instanceof JsonExpression;
 
             if (jsonAccess) {
                 JsonExpression access = left instanceof JsonExpression
@@ -1102,7 +1172,11 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
                 else if ("&".equals(img)) { BitwiseAnd     r = new BitwiseAnd();     r.setLeftExpression(left); r.setRightExpression(right); left = r; }
                 else if ("<->".equals(img) || "<#>".equals(img)) { GeometryDistance r = new GeometryDistance(img); r.setLeftExpression(left); r.setRightExpression(right); left = r; }
             }
-            linkAST(left, first);
+            if (extended) {
+                widen(left, first, getToken(0));
+            } else {
+                linkAST(left, first);
+            }
         }
         return left;
     }
@@ -3481,6 +3555,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
      */
     private StringValue stringValue(Token token) throws ParseException {
         StringValue value = new StringValue(token.image);
+        linkAST(value, token, token);
         // a U&'...' string brings its own escaping
         if (value.getQuoteStr() == null || value.getQuoteStr().startsWith("$")
                 || value.getEscaping() == StringValue.Escaping.POSTGRESQL_UNICODE_ESCAPE) {
@@ -3706,6 +3781,15 @@ TOKEN_MGR_DECLS : {
 	{
 		t.absoluteBegin = getCurrentTokenAbsolutePosition();
 		t.absoluteEnd = t.absoluteBegin + t.image.length();
+        // comments come through no token action, so they take their position from where their match began
+        if (input_stream instanceof SimpleCharStream) {
+            SimpleCharStream stream = (SimpleCharStream) input_stream;
+            for (Token comment = t.specialToken; comment != null; comment = comment.specialToken) {
+                comment.absoluteBegin = stream.getAbsoluteBegin(comment.beginLine, comment.beginColumn);
+                comment.absoluteEnd = comment.absoluteBegin + comment.image.length();
+            }
+            stream.forgetMatchBegins();
+        }
         // Track the lexical region independently of parser lookahead: nested SELECT
         // disambiguation can fetch PATTERN tokens before its production is entered.
         if (rowPatternContext == null && t.kind == S_IDENTIFIER
@@ -4780,16 +4864,17 @@ Statement Statement() #Statement:
     Statement stm = null;
     Statement stm2 = null;
     Expression condition;
+    Token ifFirst = null;
 }
 {
     (
          try {
             (
-                 <K_IF> condition=Condition()
-                 ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
+                 <K_IF> { ifFirst = getToken(0); } condition=Condition()
+                 ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); linkAST(ifElseStatement, ifFirst); }
                  [ LOOKAHEAD(2)
                      [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                     <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2);  }
+                     <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2); widen(ifElseStatement, null, getToken(0)); }
                  ]
 
                  [
@@ -4834,6 +4919,7 @@ Statement SingleStatement() :
 {
     Statement stm = null;
     List<WithItem<?>> with = null;
+    Token first = getToken(1);
 }
 {
         (
@@ -4855,7 +4941,7 @@ Statement SingleStatement() :
            LOOKAHEAD(3) (
                 [ LOOKAHEAD(2) with=WithList() ]
                 (
-                    stm = SelectWithWithItems( with )
+                    stm = SelectWithWithItems( with ) { if (with != null) { widen(stm, first, null); } }
                     |
                     stm = InsertWithWithItems( with )
                     |
@@ -5002,7 +5088,12 @@ Statement SingleStatement() :
             |
             LOOKAHEAD({ Dialect.EXASOL.name().equals(getAsString(Feature.dialect)) }) ( stm = Import() | stm = Export() )
         )
-        { return stm; }
+        {
+            if (stm instanceof ASTNodeAccess) {
+                linkASTIfMissing((ASTNodeAccess) stm, first);
+            }
+            return stm;
+        }
 }
 
 OracleBlock OracleBlock():
@@ -5110,7 +5201,7 @@ Block Block() #Block : {
 }
 {
     block = BeginEndBlock()
-    [LOOKAHEAD(2) <ST_SEMICOLON> { block.setSemicolonAfterEnd(true); } ]
+    [LOOKAHEAD(2) <ST_SEMICOLON> { block.setSemicolonAfterEnd(true); widen(block, null, getToken(0)); } ]
     {
         return block;
     }
@@ -5122,6 +5213,7 @@ Block BeginEndBlock(): {
     List<Statement> list = new ArrayList<Statement>();
     Statement stm;
     Block block = new Block();
+    Token first = getToken(1);
 }
 {
     <K_BEGIN>
@@ -5151,6 +5243,7 @@ Block BeginEndBlock(): {
 
     <K_END>
     {
+        linkAST(block, first);
         return block;
     }
 }
@@ -5160,6 +5253,7 @@ Statements Statements() #Statements: {
     IfElseStatement ifElseStatement = null;
     Statement stm = null;
     Statement stm2 = null;
+    Token ifFirst = null;
     Expression condition;
 }
 {
@@ -5187,11 +5281,11 @@ Statements Statements() #Statements: {
 
              try {
                 (
-                     <K_IF> condition=Condition()
-                     ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
+                     <K_IF> { ifFirst = getToken(0); } condition=Condition()
+                     ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); linkAST(ifElseStatement, ifFirst); }
                      [ LOOKAHEAD(2)
                          [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                         <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2);  }
+                         <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2); widen(ifElseStatement, null, getToken(0)); }
                      ]
 
                      { requireStatementBoundary(); stmts.add( ifElseStatement ); }
@@ -5239,11 +5333,11 @@ Statements Statements() #Statements: {
             }
             try {
                 (
-                    <K_IF> condition=Condition()
-                    ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
+                    <K_IF> { ifFirst = getToken(0); } condition=Condition()
+                    ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); linkAST(ifElseStatement, ifFirst); }
                     [ LOOKAHEAD(2)
                         [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                        <K_ELSE> ( stm2 = SingleStatement() | stm2 = Block() ) {  ifElseStatement.setElseStatement(stm2);  }
+                        <K_ELSE> ( stm2 = SingleStatement() | stm2 = Block() ) {  ifElseStatement.setElseStatement(stm2); widen(ifElseStatement, null, getToken(0)); }
                     ]
 
                     { requireStatementBoundary(); stmts.add( ifElseStatement ); }
@@ -5299,7 +5393,9 @@ UnsupportedStatement captureStatementTokens(Token statementStart) {
             break;
         }
     }
-    return new UnsupportedStatement(tokenImages);
+    UnsupportedStatement statement = new UnsupportedStatement(tokenImages);
+    linkAST(statement, statementStart.next, statementEnd);
+    return statement;
 }
 
 JAVACODE
@@ -6379,7 +6475,7 @@ SetStatement SetAssignments(): {
     (
         ","
         ( LOOKAHEAD(3) SetAssignment(set)
-          | exp=Expression() { set.getExpressions(set.getCount() - 1).add(exp); } )
+          | exp=Expression() { set.getExpressions(set.getCount() - 1).add(exp); widen(set.getExpressions(set.getCount() - 1), null, getToken(0)); } )
     )*
     { return set; }
 }
@@ -6411,7 +6507,7 @@ void SetAssignment(SetStatement set):
                 && (name instanceof UserVariable || "Time Zone".equals(name))) {
             throw new ParseException("SET TO requires a configuration parameter name");
         }
-        set.add(name, new ExpressionList<Expression>(expression), operator);
+        set.add(name, linkElements(new ExpressionList<Expression>(expression)), operator);
     }
     )
     {
@@ -6432,7 +6528,7 @@ Expression SetAssignmentValue():
 }
 {
     ( LOOKAHEAD({ getToken(1).kind == K_ON && getToken(0).kind == K_TO })
-      value=<K_ON> { expression = new Column(value.image); }
+      value=<K_ON> { expression = linkToLastToken(new Column(value.image)); }
       | expression=Expression() )
     { return expression; }
 }
@@ -6449,8 +6545,8 @@ void SetCharacterSet(SetStatement set):
       | <S_IDENTIFIER> { name = "CHARSET"; } )
     ( value=<S_CHAR_LITERAL> { expression = stringValue(value); }
       | (value=<S_IDENTIFIER> | value=<S_QUOTED_IDENTIFIER> | value=<K_DEFAULT>)
-        { expression = new Column(value.image); } )
-    { set.add(name, new ExpressionList<Expression>(expression), false); }
+        { expression = linkToLastToken(new Column(value.image)); } )
+    { set.add(name, linkElements(new ExpressionList<Expression>(expression)), false); }
 }
 
 SetStatement SqlServerSetOnOffOptions(): {
@@ -6667,7 +6763,7 @@ PrepareStatement PrepareStatement() #PrepareStatement:
 ColDataType PrepareParameterType():
 { ColDataType type; Token token; }
 {
-    ( token=<K_UNKNOWN> { type = new ColDataType(token.image); }
+    ( token=<K_UNKNOWN> { type = linkToLastToken(new ColDataType(token.image)); }
       | type=ColDataType() )
     { return type; }
 }
@@ -7003,6 +7099,7 @@ ExplainStatement Explain():
     List<ExplainStatement.Option> options;
     ExplainStatement es;
     boolean parenthesized = false;
+    Token statementFirst;
 }
 {
     ( tk=<K_EXPLAIN> | tk = <K_SUMMARIZE> )
@@ -7012,10 +7109,11 @@ ExplainStatement Explain():
                 LOOKAHEAD(2) "(" options = PostgresqlExplainOptions() ")" { parenthesized = true; }
                 | options = ExplainStatementOptions()
             )
+            { statementFirst = getToken(1); }
             (
                 [ LOOKAHEAD(2) with=WithList() ]
                 (
-                    statement = SelectWithWithItems( with )
+                    statement = SelectWithWithItems( with ) { if (with != null) { widen(statement, statementFirst, null); } }
                     | statement = InsertWithWithItems( with )
                     | statement = UpdateWithWithItems( with )
                     | statement = DeleteWithWithItems( with )
@@ -7023,6 +7121,9 @@ ExplainStatement Explain():
                 )
             )
             {
+                if (statement instanceof ASTNodeAccess) {
+                    linkASTIfMissing((ASTNodeAccess) statement, statementFirst);
+                }
                 es = new ExplainStatement(tk.image, statement, options);
                 es.setParenthesizedOptions(parenthesized);
             }
@@ -7349,7 +7450,7 @@ ShowCreateStatement ShowCreate(): {
         <K_USER> { statement.setObjectType(ShowCreateStatement.ObjectType.USER); }
         (
             LOOKAHEAD({ isKeywordAhead("CURRENT_USER") }) currentUser = RelObjectName()
-            { account.setUser(new StringValue(currentUser).setQuoteStr("")); }
+            { account.setUser(linkToLastToken(new StringValue(currentUser).setQuoteStr(""))); }
             [ LOOKAHEAD(2) "(" ")" { statement.setCurrentUserParentheses(true); } ]
             |
             account = MySqlAccountName()
@@ -7432,12 +7533,15 @@ ShowTablesStatement ShowTables(): {
 
 Values Values(): {
     ExpressionList expressions;
+    Token first = getToken(1);
 } {
     ( <K_VALUES> | <K_VALUE> )
     expressions = ExpressionList()
 
     {
-        return new Values(expressions);
+        Values values = new Values(expressions);
+        linkAST(values, first);
+        return values;
     }
 }
 
@@ -7643,7 +7747,12 @@ List<UpdateSet> UpdateSets():
     (
         (
             tableColumn=Column() "=" valueExpression=Expression()
-            { updateSets.add( new UpdateSet (tableColumn, valueExpression)); }
+            {
+                updateSet = new UpdateSet(tableColumn, valueExpression);
+                linkElements(updateSet.getColumns());
+                linkElements(updateSet.getValues());
+                updateSets.add(updateSet);
+            }
         )
         |
         (
@@ -7651,7 +7760,7 @@ List<UpdateSet> UpdateSets():
             columns = ParenthesedExpressionList() { updateSet.setColumns(columns); }
             "="
             (
-                LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues( new ExpressionList(valueExpression)); }
+                LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues(linkElements(new ExpressionList(valueExpression))); }
                 |
                 values = ParenthesedExpressionList() { updateSet.setValues(values); }
             )
@@ -7661,14 +7770,19 @@ List<UpdateSet> UpdateSets():
     (
         LOOKAHEAD(2) "," (
             tableColumn=Column() "=" valueExpression=Expression()
-            { updateSets.add( new UpdateSet (tableColumn, valueExpression)); }
+            {
+                updateSet = new UpdateSet(tableColumn, valueExpression);
+                linkElements(updateSet.getColumns());
+                linkElements(updateSet.getValues());
+                updateSets.add(updateSet);
+            }
             |
             (
                 { updateSet = new UpdateSet(); updateSets.add(updateSet); }
                 columns = ParenthesedExpressionList() { updateSet.setColumns(columns); }
                 "="
                 (
-                    LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues( new ExpressionList(valueExpression)); }
+                    LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues(linkElements(new ExpressionList(valueExpression))); }
                     |
                     values = ParenthesedExpressionList() { updateSet.setValues(values); }
                 )
@@ -7768,11 +7882,13 @@ InsertBulk.Option InsertBulkOption():
             option.getOrderByElements().add(order);
         }
         [ (direction=<K_ASC> | direction=<K_DESC>) { order.setAsc(direction.kind == K_ASC); order.setAscDescPresent(true); } ]
+        { linkAST(order, firstToken(column, getToken(0))); }
         ( "," column=Column() {
             order = new OrderByElement().withExpression(column);
             option.getOrderByElements().add(order);
           }
           [ (direction=<K_ASC> | direction=<K_DESC>) { order.setAsc(direction.kind == K_ASC); order.setAscDescPresent(true); } ]
+          { linkAST(order, firstToken(column, getToken(0))); }
         )* ")"
         |
         LOOKAHEAD({ isKeywordAhead("ROWS_PER_BATCH") }) AccessKeyword("ROWS_PER_BATCH") "=" value=<S_LONG>
@@ -8354,17 +8470,22 @@ MergeInsert MergeInsertClause(Expression predicate) : {
     ExpressionList<Column> columns;
     ExpressionList expList;
     Expression condition;
+    Token open;
 }
 {
     <K_INSERT>
-    [ "(" columns = ColumnList() ")"
+    [ open="(" columns = ColumnList() ")"
         {
-            mi.setColumns( new ParenthesedExpressionList<Column>(columns) );
+            ParenthesedExpressionList<Column> insertColumns = new ParenthesedExpressionList<Column>(columns);
+            linkAST(insertColumns, open);
+            mi.setColumns(insertColumns);
         }
     ]
-    <K_VALUES> "(" expList = SimpleExpressionList() ")"
+    <K_VALUES> open="(" expList = SimpleExpressionList() ")"
     {
-        mi.setValues( new ParenthesedExpressionList(expList) );
+        ParenthesedExpressionList insertValues = new ParenthesedExpressionList(expList);
+        linkAST(insertValues, open);
+        mi.setValues(insertValues);
     }
 
     [ <K_WHERE> condition = Expression() { mi.setWhereCondition(condition); } ]
@@ -8450,12 +8571,14 @@ Column Column() #Column :
     ObjectNames data = null;
     ArrayConstructor arrayConstructor = null;
     Token tk = null;
+    Token first = getToken(1);
+    Token name;
 }
 {
-    data = ColumnIdentifier()
+    data = ColumnIdentifier() { name = getToken(0); }
     [ LOOKAHEAD(2) <K_COMMENT> tk=<S_CHAR_LITERAL> ]
     // @todo: we better should return a SEQUENCE instead of a COLUMN
-    [  LOOKAHEAD(2) "." <K_NEXTVAL> { data.getNames().add("nextval"); } ]
+    [  LOOKAHEAD(2) "." <K_NEXTVAL> { data.getNames().add("nextval"); name = getToken(0); } ]
 
     [ LOOKAHEAD(2) arrayConstructor = Subscript() ]
     {
@@ -8464,6 +8587,10 @@ Column Column() #Column :
         if (arrayConstructor!=null) {
             col.setArrayConstructor(arrayConstructor);
         }
+        Token qualifierLast = qualifierLast(first, name);
+        if (col.getTable() != null && qualifierLast != null) {
+            linkAST(col.getTable(), first, qualifierLast);
+        }
         linkAST(col,jjtThis);
         return col;
     }
@@ -9487,6 +9614,7 @@ PlainSelect PlainSelect() #PlainSelect:
     PreferringClause preferringClause = null;
     ExpressionList expressionList = null;
     boolean partitionByBrackets = false;
+    Token partitionFirst = null;
     List<Table> intoTables = null;
     MySqlSelectIntoClause mySqlSelectIntoClause = null;
     MySqlProcedureAnalyse mySqlProcedureAnalyse = null;
@@ -9591,7 +9719,7 @@ PlainSelect PlainSelect() #PlainSelect:
     [ LOOKAHEAD(2) where=WhereClause() { plainSelect.setWhere(where); }]
     [ LOOKAHEAD(2) oracleHierarchicalQueryClause=OracleHierarchicalQueryClause() { plainSelect.setOracleHierarchical(oracleHierarchicalQueryClause); } ]
     [ LOOKAHEAD(2) preferringClause=PreferringClause() { plainSelect.setPreferringClause(preferringClause); }
-        [LOOKAHEAD(2) <K_PARTITION> <K_BY>
+        [LOOKAHEAD(2) partitionFirst=<K_PARTITION> <K_BY>
             (
                 LOOKAHEAD(2) expressionList=ComplexExpressionList()
                 |
@@ -9599,6 +9727,7 @@ PlainSelect PlainSelect() #PlainSelect:
             )
             {
                 preferringClause.setPartitionExpressionList(expressionList, partitionByBrackets);
+                linkAST(preferringClause.getPartitionBy(), partitionFirst);
             }
         ]
     ]
@@ -9628,7 +9757,7 @@ PlainSelect PlainSelect() #PlainSelect:
     // expression avoids a numeric LOOKAHEAD, which cannot see past a long parenthesized
     // subquery and would wrongly commit to LIMIT BY (issue #2359).
     [ LOOKAHEAD(1, <K_LIMIT>) limit = LimitWithOffset()
-        [ LOOKAHEAD(1, <K_BY>) <K_BY> expressionList = ExpressionList() { limit.setByExpressions(expressionList); } ]
+        [ LOOKAHEAD(1, <K_BY>) <K_BY> expressionList = ExpressionList() { limit.setByExpressions(expressionList); widen(limit, null, getToken(0)); } ]
         {
             if (limit.getByExpressions() != null) {
                 plainSelect.setLimitBy(limit);
@@ -9889,6 +10018,7 @@ Expression WithItemExpression():
 {
     LambdaExpression lambdaExpression;
     Expression expr;
+    Token open;
 }
 {
     (
@@ -9902,8 +10032,8 @@ Expression WithItemExpression():
         |
         // whole lambda wrapped in parentheses, e.g. (x -> x * 2)
         LOOKAHEAD( "(" ( RelObjectName() | ParenthesedColumnList() ) "->" )
-        "(" lambdaExpression = LambdaExpression() ")"
-        { expr = new ParenthesedExpressionList<Expression>(lambdaExpression); }
+        open="(" lambdaExpression = LambdaExpression() ")"
+        { expr = new ParenthesedExpressionList<Expression>(lambdaExpression); linkAST(expr, open); }
         |
         expr = Expression()
     )
@@ -9927,6 +10057,7 @@ WithSearchClause WithSearchClause() #WithSearchClause:
     <K_SET>
     sequenceColumnName = RelObjectName()
     {
+        linkElements(searchColumns);
         return new WithSearchClause(
                 "BREADTH".equalsIgnoreCase(orderingToken.image)
                         ? WithSearchClause.SearchOrder.BREADTH
@@ -9944,8 +10075,9 @@ WithCycleClause WithCycleClause() #WithCycleClause:
 }
 {
     <K_CYCLE>
-    name=RelObjectName() { columns.add(createColumn(name)); }
-    ( "," name=RelObjectName() { columns.add(createColumn(name)); } )*
+    name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); }
+    ( "," name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); } )*
+    { linkElements(columns); }
     <K_SET> name=RelObjectName() { cycle.setMarkColumnName(name); }
     [ <K_TO> value=Expression() { cycle.setMarkValue(value); }
       <K_DEFAULT> value=Expression() { cycle.setMarkDefault(value); } ]
@@ -10110,14 +10242,16 @@ Expression SelectItemExpression() #ColumnsExpression(transformers != null):
     Expression expression;
     ColumnsTransformer transformer;
     List<ColumnsTransformer> transformers = null;
+    Token first;
 }
 {
     // @fixme: Oracle's SEQUENCE.nextval is parsed as COLUMN with a name part nextval
     // @todo: parse a proper SEQUENCE instead of a COLUMN
+    { first = getToken(1); }
     (
-        LOOKAHEAD({ isPriorOperatorAhead() }) expression = ConnectByPriorOperator()
+        LOOKAHEAD({ isPriorOperatorAhead() }) expression = ConnectByPriorOperator() { linkASTIfMissing(expression, first); }
         |
-        ( expression = Condition() { expression = prattExpressionRest(expression, 2); } )
+        ( expression = Condition() { expression = prattExpressionRest(expression, first, 2); } )
     )
     (
         LOOKAHEAD( <K_APPLY> "(" | <K_REPLACE> [ <K_STRICT> ] "("
@@ -10168,6 +10302,7 @@ ColumnsTransformer ColumnsTransformer():
     ColumnsTransformer transformer;
     Token tk;
     boolean strict;
+    Token first = getToken(1);
 }
 {
     (
@@ -10204,7 +10339,7 @@ ColumnsTransformer ColumnsTransformer():
               |
               column = Column()
               {
-                  exceptColumns = new ParenthesedExpressionList<Column>(column);
+                  exceptColumns = linkElements(new ParenthesedExpressionList<Column>(column));
                   transformer.setParenthesized(false);
               }
           )
@@ -10245,7 +10380,7 @@ ColumnsTransformer ColumnsTransformer():
           )
           { transformer.setRenameItems(replaceItems); }
     )
-    { return transformer; }
+    { linkAST(transformer, first); return transformer; }
 }
 
 /**
@@ -10421,11 +10556,16 @@ SelectItem<Function> FunctionItem():
 {
     Alias alias = null;
     Function function;
+    Token first = getToken(1);
 }
 {
     function=Function()
     [ LOOKAHEAD({ isAliasAhead() }) alias=Alias() ]
-    { return new SelectItem<Function>(function, alias); }
+    {
+        SelectItem<Function> item = new SelectItem<Function>(function, alias);
+        linkAST(item, first);
+        return item;
+    }
 }
 
 ExpressionList<Column> PivotForColumns():
@@ -10437,7 +10577,7 @@ ExpressionList<Column> PivotForColumns():
     (
         columns = ParenthesedColumnList()
         |
-        column = Column() { columns = new ExpressionList<Column>(column); }
+        column = Column() { columns = linkElements(new ExpressionList<Column>(column)); }
     )
     { return columns; }
 }
@@ -10510,11 +10650,16 @@ SelectItem<ExpressionList<?>> ExpressionListItem():
 {
     ExpressionList expressionList;
     Alias alias = null;
+    Token first = getToken(1);
 }
 {
     expressionList=ParenthesedExpressionList()
     [ LOOKAHEAD({ isAliasAhead() }) alias=Alias() ]
-    { return new SelectItem<ExpressionList<?>>(expressionList, alias); }
+    {
+        SelectItem<ExpressionList<?>> item = new SelectItem<ExpressionList<?>>(expressionList, alias);
+        linkAST(item, first);
+        return item;
+    }
 }
 
 List<SelectItem<ExpressionList<?>>> PivotMultiInItems():
@@ -10649,7 +10794,7 @@ MySqlSelectIntoClause MySqlSelectIntoClause(MySqlSelectIntoClause.Position posit
           // Same shape as IntoClause() above: a PlainSelect can be followed by "," (subselect in
           // an expression list), so the repetition needs two tokens to decide.
           ( LOOKAHEAD(2) "," variable=MySqlIntoVariable() { variables.add(variable); } )*
-          { intoClause.setType(MySqlSelectIntoClause.Type.VARIABLES); intoClause.setVariables(variables); }
+          { intoClause.setType(MySqlSelectIntoClause.Type.VARIABLES); intoClause.setVariables(linkElements(variables)); }
     )
     {
         return intoClause;
@@ -10676,6 +10821,7 @@ MySqlProcedureAnalyse MySqlProcedureAnalyse():
     MySqlProcedureAnalyse procedureAnalyse = new MySqlProcedureAnalyse();
     Token maxElements = null;
     Token maxMemory = null;
+    Token first = getToken(1);
 }
 {
     <K_PROCEDURE> <K_ANALYSE> "("
@@ -10687,10 +10833,13 @@ MySqlProcedureAnalyse MySqlProcedureAnalyse():
     {
         if (maxElements != null) {
             procedureAnalyse.setMaxElements(new LongValue(maxElements.image));
+            linkAST(procedureAnalyse.getMaxElements(), maxElements, maxElements);
         }
         if (maxMemory != null) {
             procedureAnalyse.setMaxMemory(new LongValue(maxMemory.image));
+            linkAST(procedureAnalyse.getMaxMemory(), maxMemory, maxMemory);
         }
+        linkAST(procedureAnalyse, first);
         return procedureAnalyse;
     }
 }
@@ -11096,13 +11245,16 @@ RowPattern RowPatternSequence(int depth):
 {
     List<RowPattern> patterns = new ArrayList<RowPattern>();
     RowPattern pattern;
+    Token first = getToken(1);
 }
 {
     ( LOOKAHEAD({ isRowPatternPrimaryAhead() }) pattern=RowPatternFactor(depth) { patterns.add(pattern); } )*
     {
         if (patterns.isEmpty()) { return new RowPattern.Empty(); }
-        return patterns.size() == 1 ? patterns.get(0)
-            : new RowPattern.Operation(RowPattern.Operation.Type.SEQUENCE, patterns);
+        if (patterns.size() == 1) { return patterns.get(0); }
+        RowPattern result = new RowPattern.Operation(RowPattern.Operation.Type.SEQUENCE, patterns);
+        linkAST(result, first);
+        return result;
     }
 }
 
@@ -11111,6 +11263,7 @@ RowPattern RowPatternFactor(int depth) #RowPatternFactor:
     RowPattern pattern;
     String name;
     List<RowPattern> permutations = new ArrayList<RowPattern>();
+    Token first = getToken(1);
 }
 {
     (
@@ -11131,6 +11284,7 @@ RowPattern RowPatternFactor(int depth) #RowPatternFactor:
                 && (pattern instanceof RowPattern.Permute || pattern instanceof RowPattern.Exclusion)) {
             throw new ParseException("BigQuery does not support PERMUTE or row pattern exclusion");
         }
+        linkAST(pattern, first);
     }
     [ LOOKAHEAD({ !(pattern instanceof RowPattern.Anchor)
             && ("?".equals(getToken(1).image) || "*".equals(getToken(1).image)
@@ -11169,13 +11323,14 @@ Expression RowPatternBound():
 {
     Token value;
     Expression result;
+    Token first = getToken(1);
 }
 {
     ( value=<S_LONG> { result = new LongValue(value.image); }
       | "?" { result = new JdbcParameter(++jdbcParameterIndex, false, "?"); }
       | result=UserVariable()
     )
-    { return result; }
+    { linkASTIfMissing(result, first); return result; }
 }
 
 List<Join> JoinsList():
@@ -11431,6 +11586,7 @@ OracleHierarchicalExpression OracleHierarchicalQueryClause():
 {
     OracleHierarchicalExpression result = new OracleHierarchicalExpression();
     Expression expr;
+    Token first = getToken(1);
 }
 {
     (
@@ -11452,6 +11608,7 @@ OracleHierarchicalExpression OracleHierarchicalQueryClause():
         )
     )
     {
+        linkAST(result, first);
         return result;
     }
 }
@@ -11508,12 +11665,14 @@ Expression Plus():
 Expression PriorTo():
 {
     Expression left, right, result;
+    Token first = getToken(1);
+    Token open;
 }
 {
     (
         LOOKAHEAD(3) left=PreferenceTermTerminal()
         |
-        "(" left=PreferenceTerm() ")" { left = new ParenthesedExpressionList(left); }
+        open="(" left=PreferenceTerm() ")" { left = new ParenthesedExpressionList(left); linkAST(left, open); }
     )
     { result = left; }
 
@@ -11522,10 +11681,11 @@ Expression PriorTo():
         (
             LOOKAHEAD(3) right=PreferenceTermTerminal()
             |
-            "(" right=PreferenceTerm() ")" { left = new ParenthesedExpressionList(right); }
+            open="(" right=PreferenceTerm() ")" { left = new ParenthesedExpressionList(right); linkAST(left, open); }
         )
         {
             result = new PriorTo(left, right);
+            linkAST(result, first);
             left = result;
         }
     )*
@@ -11676,7 +11836,7 @@ ExpressionList<Expression> GroupingSet():
     (
         LOOKAHEAD(2) list = ParenthesedExpressionList()
         |
-        expression = SimpleExpression() { list = new ExpressionList<Expression>(expression); }
+        expression = SimpleExpression() { list = linkElements(new ExpressionList<Expression>(expression)); }
     )
     {
         return list;
@@ -11724,6 +11884,7 @@ OrderByElement OrderByElement():
     Expression columnReference = null;
     Token collateToken = null;
     WithFill withFill = null;
+    Token first = getToken(1);
 }
 {
     columnReference = Expression()
@@ -11741,6 +11902,7 @@ OrderByElement OrderByElement():
     [ LOOKAHEAD(2) <K_WITH> <K_ROLLUP> { orderByElement.setMysqlWithRollup(true); } ]
     {
         orderByElement.setExpression(columnReference);
+        linkAST(orderByElement, first);
         return orderByElement;
     }
 }
@@ -12102,6 +12264,7 @@ OracleHint getOracleHint() {
     if (OracleHint.isHintMatch(tok.image)) {
       hint = new OracleHint();
       hint.setComment(tok.image);
+      linkAST(hint, tok, tok);
     }
   }
   return hint;
@@ -12135,10 +12298,12 @@ First First():
 Expression Expression() #Expression :
 {
     Expression expression = null;
+    Token first;
 }
 {
+    { first = getToken(1); }
     expression=Condition()
-    { expression = prattExpressionRest(expression, 2); }
+    { expression = prattExpressionRest(expression, first, 2); }
     {
         linkAST(expression,jjtThis);
         return expression;
@@ -12149,15 +12314,16 @@ Expression XorExpression():
 {
     Expression result;
     Expression right;
+    Token first = getToken(1);
 }
 {
     result=AndChain()
     (
         LOOKAHEAD(2)
         (
-            <K_OR>  right=AndChain() { result = new OrExpression(result, right); }
+            <K_OR>  right=AndChain() { result = new OrExpression(result, right); linkAST(result, first); }
             |
-            <K_XOR> right=AndChain() { result = new XorExpression(result, right); }
+            <K_XOR> right=AndChain() { result = new XorExpression(result, right); linkAST(result, first); }
         )
     )*
     { return result; }
@@ -12168,6 +12334,7 @@ Expression AndChain():
 {
     Expression result;
     Expression right;
+    Token first = getToken(1);
 }
 {
     result=Condition()
@@ -12176,11 +12343,13 @@ Expression AndChain():
         (
             <K_AND> right=Condition() {{
                 AndExpression a = new AndExpression(result, right); result = a;
+                linkAST(result, first);
             }}
             |
             <OP_DOUBLEAND> right=Condition() {{
                 AndExpression a = new AndExpression(result, right);
                 a.setUseOperator(true); result = a;
+                linkAST(result, first);
             }}
         )
     )*
@@ -12193,13 +12362,16 @@ Expression Condition():
     Expression left;
     // Leading NOT / ! prefixes, leftmost token wraps outermost (issue #1170).
     final Deque<Boolean> exclamationMarks = new ArrayDeque<Boolean>();
+    final Deque<Token> notTokens = new ArrayDeque<Token>();
     int oraclePrior = EqualsTo.NO_ORACLE_PRIOR;
     int oracleJoin = EqualsTo.NO_ORACLE_JOIN;
+    Token prior = null;
 }
 {
     (
         LOOKAHEAD({ getToken(1).kind == K_NOT || "!".equals(getToken(1).image) })
         ( <K_NOT> { exclamationMarks.addFirst(Boolean.FALSE); } | "!" { exclamationMarks.addFirst(Boolean.TRUE); } )
+        { notTokens.addFirst(getToken(0)); }
     )*
     (
         LOOKAHEAD(<K_EXISTS> JdbcNamedParameter() ":", {
@@ -12215,7 +12387,7 @@ Expression Condition():
           // lookahead simulation (this path runs for every plain condition)
           LOOKAHEAD({ !interrupted })
           // A choice rather than [...], so that enclosing syntactic lookaheads honour the guard
-          ( LOOKAHEAD({ isPriorOperatorAhead() }) <K_PRIOR> { oraclePrior = EqualsTo.ORACLE_PRIOR_START; } | {} )
+          ( LOOKAHEAD({ isPriorOperatorAhead() }) <K_PRIOR> { oraclePrior = EqualsTo.ORACLE_PRIOR_START; prior = getToken(0); } | {} )
           left=SimpleExpression() { result = left; }
 
           // Consume Oracle (+) once, before dispatching
@@ -12225,7 +12397,7 @@ Expression Condition():
               {
                   oracleJoin = EqualsTo.ORACLE_JOIN_RIGHT;
                   if (left instanceof Column) {
-                      ((Column) left).setOldOracleJoinSyntax(oracleJoin);
+                      ((Column) left).setOldOracleJoinSyntax(oracleJoin); widen(left, null, getToken(0));
                   }
               }
           ]
@@ -12268,9 +12440,11 @@ Expression Condition():
         if (oraclePrior == EqualsTo.ORACLE_PRIOR_START
                 && result instanceof SupportsOldOracleJoinSyntax) {
             ((SupportsOldOracleJoinSyntax) result).setOraclePriorPosition(oraclePrior);
+            widen(result, prior, null);
         }
         while (!exclamationMarks.isEmpty()) {
             result = new NotExpression(result, exclamationMarks.pollFirst());
+            linkAST(result, notTokens.pollFirst());
         }
         return result;
     }
@@ -12345,6 +12519,7 @@ Expression RegularConditionRHS(Expression leftExpression, int oracleJoinRight) #
 Expression OverlapsCondition(Expression leftExpression):
 {
     ExpressionList right;
+    Token operator = getToken(1);
 }
 {
     <K_OVERLAPS>
@@ -12354,9 +12529,11 @@ Expression OverlapsCondition(Expression leftExpression):
         if (leftExpression instanceof ExpressionList) {
             left = (ExpressionList) leftExpression;
         } else {
-            left = new ExpressionList(leftExpression);
+            left = linkElements(new ExpressionList(leftExpression));
         }
-        return new OverlapsCondition(left, right);
+        OverlapsCondition result = new OverlapsCondition(left, right);
+        linkAST(result, firstToken(leftExpression, operator));
+        return result;
     }
 }
 
@@ -12474,6 +12651,7 @@ Expression ExcludesExpression(Expression leftExpression) #ExcludesExpression :
 Expression Between(Expression leftExpression) :
 {
     Between result = new Between();
+    Token operator = getToken(1);
     Expression betweenExpressionStart = null;
     Expression betweenExpressionEnd = null;
 }
@@ -12500,7 +12678,7 @@ Expression Between(Expression leftExpression) :
                 "(" "+" ")"
                 {
                     if (betweenExpressionStart instanceof Column) {
-                        ((Column) betweenExpressionStart).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                        ((Column) betweenExpressionStart).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(betweenExpressionStart, null, getToken(0));
                     }
                 }
             ]
@@ -12520,7 +12698,7 @@ Expression Between(Expression leftExpression) :
                 "(" "+" ")"
                 {
                     if (betweenExpressionEnd instanceof Column) {
-                        ((Column) betweenExpressionEnd).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                        ((Column) betweenExpressionEnd).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(betweenExpressionEnd, null, getToken(0));
                     }
                 }
             ]
@@ -12530,6 +12708,7 @@ Expression Between(Expression leftExpression) :
         result.setLeftExpression(leftExpression);
         result.setBetweenExpressionStart(betweenExpressionStart);
         result.setBetweenExpressionEnd(betweenExpressionEnd);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12570,7 +12749,7 @@ Expression LikeExpression(Expression leftExpression) #LikeExpression:
         "(" "+" ")"
         {
             if (rightExpression instanceof Column) {
-                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(rightExpression, null, getToken(0));
             }
         }
     ]
@@ -12603,7 +12782,7 @@ Expression SimilarToExpression(Expression leftExpression) #SimilarToExpression:
         "(" "+" ")"
         {
             if (rightExpression instanceof Column) {
-                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(rightExpression, null, getToken(0));
             }
         }
     ]
@@ -12635,6 +12814,7 @@ Expression IsDistinctExpression(Expression leftExpression) #IsDistinctExpression
 Expression IsNullExpression(Expression leftExpression):
 {
     IsNullExpression result = new IsNullExpression();
+    Token operator = getToken(1);
 }
 {
     (
@@ -12644,6 +12824,7 @@ Expression IsNullExpression(Expression leftExpression):
     )
     {
         result.setLeftExpression(leftExpression);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12651,6 +12832,7 @@ Expression IsNullExpression(Expression leftExpression):
 Expression IsBooleanExpression(Expression leftExpression):
 {
     IsBooleanExpression result = new IsBooleanExpression();
+    Token operator = getToken(1);
 }
 {
         (
@@ -12659,6 +12841,7 @@ Expression IsBooleanExpression(Expression leftExpression):
 
     {
         result.setLeftExpression(leftExpression);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12684,6 +12867,7 @@ Expression IsJsonExpression(Expression leftExpression):
 Expression IsUnknownExpression(Expression leftExpression):
 {
     IsUnknownExpression result = new IsUnknownExpression();
+    Token operator = getToken(1);
 }
 {
         (
@@ -12692,6 +12876,7 @@ Expression IsUnknownExpression(Expression leftExpression):
 
     {
         result.setLeftExpression(leftExpression);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12700,11 +12885,13 @@ Expression ExistsExpression():
 {
     ExistsExpression result = new ExistsExpression();
     Expression rightExpression = null;
+    Token first = getToken(1);
 }
 {
     <K_EXISTS> rightExpression=SimpleExpression()
     {
         result.setRightExpression(rightExpression);
+        linkAST(result, first);
         return result;
     }
 }
@@ -12713,17 +12900,21 @@ Expression MemberOfExpression(Expression leftExpression):
 {
     MemberOfExpression result;
     Expression rightExpression = null;
+    Token operator = getToken(1);
 }
 {
     <K_MEMBER> <K_OF> rightExpression=Expression()
     {
-        return new MemberOfExpression(leftExpression, rightExpression );
+        result = new MemberOfExpression(leftExpression, rightExpression);
+        linkAST(result, firstToken(leftExpression, operator));
+        return result;
     }
 }
 
 ExpressionList ExpressionList() #ExpressionList:
 {
     ExpressionList expressionList;
+    Token first = getToken(1);
 }
 {
     (
@@ -12751,19 +12942,16 @@ ExpressionList ExpressionList() #ExpressionList:
         if ( expressionList.size() == 1 && expressionList.get(0) instanceof ExpressionList ) {
             ExpressionList subList = (ExpressionList) expressionList.get(0);
             if (expressionList instanceof ParenthesedExpressionList) {
-                if (subList instanceof ParenthesedExpressionList) {
-                    return expressionList;
-                } else {
-                    return new ParenthesedExpressionList(subList);
+                if (!(subList instanceof ParenthesedExpressionList)) {
+                    expressionList = new ParenthesedExpressionList(subList);
                 }
+            } else if (subList instanceof ParenthesedExpressionList) {
+                expressionList = new ParenthesedExpressionList(subList);
             } else {
-                if (subList instanceof ParenthesedExpressionList) {
-                    return new ParenthesedExpressionList(subList);
-                } else {
-                    return subList;
-                }
+                expressionList = subList;
             }
         }
+        linkAST(expressionList, first);
         return expressionList;
     }
 }
@@ -12771,6 +12959,7 @@ ExpressionList ExpressionList() #ExpressionList:
 ParenthesedExpressionList ParenthesedExpressionList():
 {
     ExpressionList expressions=new ExpressionList();
+    Token first = getToken(1);
 }
 {
     "("
@@ -12781,7 +12970,9 @@ ParenthesedExpressionList ParenthesedExpressionList():
     )?
     ")"
     {
-        return new ParenthesedExpressionList(expressions);
+        ParenthesedExpressionList result = new ParenthesedExpressionList(expressions);
+        linkAST(result, first);
+        return result;
     }
 }
 
@@ -12790,6 +12981,7 @@ ExpressionList SimpleExpressionList():
     ExpressionList<Column> columns;
     ExpressionList expressions = new ExpressionList();
     Expression expr;
+    Token first = getToken(1);
 }
 {
     expr=SimpleExpression() { expressions.add(expr); }
@@ -12805,6 +12997,7 @@ ExpressionList SimpleExpressionList():
         }
     )*
     {
+        linkAST(expressions, first);
         return expressions;
     }
 }
@@ -12814,11 +13007,13 @@ ExpressionList<Column> ColumnList():
 {
     ExpressionList<Column> expressions = new ExpressionList<Column>();
     Column expr;
+    Token first = getToken(1);
 }
 {
     expr=Column() { expressions.add(expr); }
     ( LOOKAHEAD(2) "," expr=Column() { expressions.add(expr); } )*
     {
+        linkAST(expressions, first);
         return expressions;
     }
 }
@@ -12826,11 +13021,14 @@ ExpressionList<Column> ColumnList():
 ParenthesedExpressionList<Column> ParenthesedColumnList():
 {
     ExpressionList<Column> expressions;
+    Token first = getToken(1);
 }
 {
     "(" expressions = ColumnList() ")"
     {
-        return new ParenthesedExpressionList<Column>(expressions);
+        ParenthesedExpressionList<Column> result = new ParenthesedExpressionList<Column>(expressions);
+        linkAST(result, first);
+        return result;
     }
 }
 
@@ -12839,6 +13037,7 @@ ExpressionList ComplexExpressionList():
     ExpressionList<Column> columns;
     ExpressionList expressions = new ExpressionList();
     Expression expr;
+    Token first = getToken(1);
 }
 {
     (
@@ -12866,6 +13065,7 @@ ExpressionList ComplexExpressionList():
     )*
 
     {
+        linkAST(expressions, first);
         return expressions;
     }
 }
@@ -12940,6 +13140,7 @@ Expression AnyComparisonExpression() :
 {
     AnyType anyType;
     Select select;
+    Token first = getToken(1);
 }
 {
     (
@@ -12951,7 +13152,9 @@ Expression AnyComparisonExpression() :
     )
     select = ParenthesedSelect()
     {
-      return new AnyComparisonExpression(anyType, select);
+      AnyComparisonExpression result = new AnyComparisonExpression(anyType, select);
+      linkAST(result, first);
+      return result;
     }
 }
 
@@ -12979,6 +13182,7 @@ Expression SimpleExpression():
             assignment.setVariable(user);
             assignment.setOperation(operation.image);
             assignment.setExpression(retval);
+            linkAST(assignment, firstToken(user, first));
             return assignment;
         } else
             return retval;
@@ -12993,7 +13197,9 @@ StringValue CharacterSetIntroducedString():
 {
     introducer=<S_IDENTIFIER> literal=<S_CHAR_LITERAL>
     {
-        return stringValue(literal).withPrefix(introducer.image);
+        StringValue result = stringValue(literal).withPrefix(introducer.image);
+        linkAST(result, introducer, literal);
+        return result;
     }
 }
 
@@ -13076,10 +13282,12 @@ ArrayExpression ArraySubscript(Expression obj): {
     }
     "]"
     {
-        return slice == null
+        ArrayExpression result = slice == null
                 ? new ArrayExpression(obj, idxExpr, null, null)
                 : new ArrayExpression(obj, null, slice.getStartExpression(),
                         slice.getEndExpression()).withStepExpression(slice.getStepExpression());
+        linkAST(result, firstToken(obj, opening));
+        return result;
     }
 }
 
@@ -13090,6 +13298,7 @@ ArrayExpression ArraySubscript(Expression obj): {
 RangeExpression SliceTail(Expression start): {
     Expression stop = null;
     Expression step = null;
+    Token colon = getToken(1);
 } {
     ":"
     [
@@ -13100,7 +13309,11 @@ RangeExpression SliceTail(Expression start): {
     [
         ":" [ LOOKAHEAD({ !isSliceDelimiter(getToken(1)) }) step = Expression() ]
     ]
-    { return new RangeExpression(start, stop).withStepExpression(step); }
+    {
+        RangeExpression result = new RangeExpression(start, stop).withStepExpression(step);
+        linkAST(result, firstToken(start, colon));
+        return result;
+    }
 }
 
 /** A subscript of a column, such as {@code col[1]}, {@code col[1, 2]} or {@code col[1:3]}. */
@@ -13120,7 +13333,11 @@ ArrayConstructor Subscript() : {
         subscriptOpenings.pop();
     }
     "]"
-    { return new ArrayConstructor(expList, false); }
+    {
+        ArrayConstructor result = new ArrayConstructor(linkElements(expList), false);
+        linkAST(result, opening);
+        return result;
+    }
 }
 
 Expression SubscriptElement():
@@ -13150,9 +13367,11 @@ Expression ArrayIndexExpression() :
     (
         LOOKAHEAD(2) token = <K_OFFSET> "(" expr = SimpleExpression() ")"
         {
-            return new Function()
+            Function offset = new Function()
                     .withName(token.image)
-                    .withParameters(new ExpressionList<Expression>(expr));
+                    .withParameters(linkElements(new ExpressionList<Expression>(expr)));
+            linkAST(offset, token);
+            return offset;
         }
         |
         expr = SimpleExpression() { return expr; }
@@ -13184,6 +13403,7 @@ StringValue CharacterLiteral():
 {
     Token literal;
     StringValue value;
+    Token first = getToken(1);
 }
 {
     literal=<S_CHAR_LITERAL> { value = stringValue(literal); }
@@ -13191,7 +13411,7 @@ StringValue CharacterLiteral():
         literal=<S_CHAR_LITERAL>
         { value.setValue(value.getValue() + stringValue(literal).getValue()); }
     )*
-    { return value; }
+    { linkAST(value, first); return value; }
 }
 
 Expression PrimaryExpression() #PrimaryExpression:
@@ -13210,6 +13430,7 @@ Expression PrimaryExpression() #PrimaryExpression:
     boolean not = false;
     boolean exclamationMarkNot = false;
     boolean dateExpressionAllowed = true;
+    Token coreFirst = null;
     ExpressionList list;
 
     final List<Map.Entry<Expression, String>> jsonIdents = new ArrayList<Map.Entry<Expression, String>>();
@@ -13221,6 +13442,7 @@ Expression PrimaryExpression() #PrimaryExpression:
         // DuckDB's chained signs, e.g. - -1 or +-+1
         ( LOOKAHEAD(1) ( innerSign="+" | innerSign="-" | innerSign="~" ) { innerSigns.add(innerSign); } )*
     ]
+    { coreFirst = getToken(1); }
     (
         <K_NULL> { retval = new NullValue(); }
 
@@ -13312,13 +13534,13 @@ Expression PrimaryExpression() #PrimaryExpression:
         | LOOKAHEAD(2, {!interrupted}) retval=Column()
             [
                 LOOKAHEAD( "(" "+" ")" ("," | ")") )
-                "(" "+" ")" { ((Column) retval).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); }
+                "(" "+" ")" { ((Column) retval).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(retval, null, getToken(0)); }
             ]
 
         | LOOKAHEAD({ !interrupted && (getToken(1).kind == K_TRUE || getToken(1).kind == K_FALSE) })
           (token=<K_TRUE> | token=<K_FALSE>) { retval = new BooleanValue(token.image); }
 
-        | retval=CharacterLiteral() { linkAST(retval,jjtThis); }
+        | retval=CharacterLiteral()
 
         | "{d" token=<S_CHAR_LITERAL> "}"  { retval = new DateValue(token.image); }
 
@@ -13366,24 +13588,25 @@ Expression PrimaryExpression() #PrimaryExpression:
                 { retval = new FunctionAllColumns(unwrapParenthesedFunction(retval)); } ]
 
             // Share field and method navigation with the other primary expressions.
-            ( LOOKAHEAD(1, ".") nxt=NavigationStep(retval) { retval = nxt; } )*
+            ( LOOKAHEAD(1, ".") { linkASTIfMissing(retval, coreFirst); } nxt=NavigationStep(retval) { retval = nxt; linkASTIfMissing(retval, coreFirst); } )*
         )
     )
+    { linkASTIfMissing(retval, coreFirst); }
 
     [
-        LOOKAHEAD(2, { !isColumnCollateAhead() }) <K_COLLATE> (token=<S_CHAR_LITERAL> | token=<S_QUOTED_IDENTIFIER> | token=<S_IDENTIFIER>) { retval = new CollateExpression(retval, token.image); }
+        LOOKAHEAD(2, { !isColumnCollateAhead() }) <K_COLLATE> (token=<S_CHAR_LITERAL> | token=<S_QUOTED_IDENTIFIER> | token=<S_IDENTIFIER>) { retval = new CollateExpression(retval, token.image); linkAST(retval, coreFirst); }
     ]
 
     [
-        LOOKAHEAD(2, { dateExpressionAllowed } ) retval = IntervalExpressionWithoutInterval(retval)
+        LOOKAHEAD(2, { dateExpressionAllowed } ) retval = IntervalExpressionWithoutInterval(retval) { linkASTIfMissing(retval, coreFirst); }
     ]
 
-    [ LOOKAHEAD(2) retval = ArrayExpression(retval) ]
+    [ LOOKAHEAD(2) retval = ArrayExpression(retval) { linkASTIfMissing(retval, coreFirst); } ]
 
     // navigation chains, e.g. Redshift SUPER col[0].field[1].sub: field accesses
     // and subscripts may alternate freely after the primary expression
     (
-        LOOKAHEAD(2) nxt = NavigationStep(retval) { retval = nxt; }
+        LOOKAHEAD(2) nxt = NavigationStep(retval) { retval = nxt; linkASTIfMissing(retval, coreFirst); }
     )*
 
     (  LOOKAHEAD(2) "::" type=ColDataType() {
@@ -13392,6 +13615,7 @@ Expression PrimaryExpression() #PrimaryExpression:
             castExpr.setLeftExpression(retval);
             castExpr.setColDataType(type);
             retval=castExpr;
+            linkAST(retval, coreFirst);
         }
     )*
 
@@ -13421,7 +13645,7 @@ Expression PrimaryExpression() #PrimaryExpression:
                 jsonIdents.add(new AbstractMap.SimpleEntry<Expression, String>(expression, token.image ));
             }
         )+
-        retval = JsonExpression(retval, jsonIdents)
+        retval = JsonExpression(retval, jsonIdents) { linkASTIfMissing(retval, coreFirst); }
     ]
 
     ( LOOKAHEAD(2) <K_AT> <K_DATETIMELITERAL> <K_ZONE> timezoneRightExpr=PrimaryExpression() {
@@ -13436,12 +13660,17 @@ Expression PrimaryExpression() #PrimaryExpression:
         if (timezoneExpr != null && !timezoneExpr.getTimezoneExpressions().isEmpty()) {
             timezoneExpr.setLeftExpression(retval);
             retval=timezoneExpr;
+            // the field behind this getter is an ExpressionList
+            linkElements((ExpressionList<?>) timezoneExpr.getTimezoneExpressions());
+            linkAST(retval, coreFirst);
         }
         for (int i = innerSigns.size() - 1; i >= 0; i--) {
             retval = new SignedExpression(innerSigns.get(i).image.charAt(0), retval);
+            linkAST(retval, innerSigns.get(i));
         }
         if (sign != null) {
             retval = new SignedExpression(sign.image.charAt(0), retval);
+            linkAST(retval, sign);
         }
         if (not) {
             retval = new NotExpression(retval, exclamationMarkNot);
@@ -13549,7 +13778,9 @@ UserVariable UserVariable() : {
 {
     tk = <S_AT_IDENTIFIER> varName=IdentifierChain2(tk.image)
     {
-        return new UserVariable(varName);
+        UserVariable result = new UserVariable(varName);
+        linkAST(result, tk);
+        return result;
     }
 }
 
@@ -13585,11 +13816,14 @@ DateTimeLiteralExpression DateTimeLiteralExpression() : {
 RangeExpression RangeExpression(Expression startExpression):
 {
     Expression endExpression;
+    Token colon = getToken(1);
 }
 {
     ":" endExpression = Expression()
     {
-        return new RangeExpression(startExpression, endExpression);
+        RangeExpression result = new RangeExpression(startExpression, endExpression);
+        linkAST(result, firstToken(startExpression, colon));
+        return result;
     }
 }
 
@@ -13614,6 +13848,7 @@ ListComprehension ListComprehension() : {
 ArrayConstructor ArrayConstructor(boolean arrayKeyword) : {
     ExpressionList<Expression> expList = new ExpressionList<Expression>();
     Expression exp;
+    Token first = getToken(1);
 } {
     "["
     [
@@ -13621,7 +13856,14 @@ ArrayConstructor ArrayConstructor(boolean arrayKeyword) : {
         ( "," exp=ArrayElement() { expList.add(exp); } )*
     ]
     "]"
-    { return new ArrayConstructor(expList, arrayKeyword); }
+    {
+        ArrayConstructor result = new ArrayConstructor(linkElements(expList), arrayKeyword);
+        // after ARRAY, the caller links the constructor from that keyword
+        if (!arrayKeyword) {
+            linkAST(result, first);
+        }
+        return result;
+    }
 }
 
 Expression ArrayElement():
@@ -14477,6 +14719,8 @@ JsonAggregateFunction JsonAggregateFunction() : {
     List<OrderByElement> olist = null;
     WindowElement windowElement = null;
     boolean partitionByBrackets = false;
+    Token partitionFirst = null;
+    Token partitionLast = null;
 }
 {
     (
@@ -14562,14 +14806,18 @@ JsonAggregateFunction JsonAggregateFunction() : {
         [   LOOKAHEAD(2)
             <K_OVER> {result.setAnalyticType(AnalyticType.OVER);}
             "("
-            [<K_PARTITION> <K_BY>
+            [partitionFirst=<K_PARTITION> <K_BY>
                 (LOOKAHEAD(3) expressionList=ComplexExpressionList()
                 | "(" {partitionByBrackets = true;} expressionList=ComplexExpressionList() ")" )
+                { partitionLast = getToken(0); }
             ]
             [olist=OrderByElements() ]
             [windowElement = WindowElement() ]
             {
                 result.setPartitionExpressionList(expressionList, partitionByBrackets);
+                if (partitionFirst != null) {
+                    linkAST(result.getPartitionExpressionList(), partitionFirst, partitionLast);
+                }
                 result.setOrderByElements(olist);
                 result.setWindowElement(windowElement);
             }
@@ -14696,6 +14944,7 @@ KeepExpression KeepExpression() : {
     KeepExpression keep = new KeepExpression();
     Token token;
     List<OrderByElement> list;
+    Token first = getToken(1);
 }
 {
     <K_KEEP> "(" token = <S_IDENTIFIER> (<K_FIRST> { keep.setFirst(true); } | <K_LAST> { keep.setFirst(false); })
@@ -14704,6 +14953,7 @@ KeepExpression KeepExpression() : {
     {
         keep.setName(token.image);
         keep.setOrderByElements(list);
+        linkAST(keep, first);
         return keep;
     }
 }
@@ -14712,6 +14962,8 @@ KeepExpression KeepExpression() : {
 void windowFun(AnalyticExpression retval):{
      ExpressionList expressionList = null;
      boolean partitionByBrackets = false;
+     Token partitionFirst = null;
+     Token partitionLast = null;
      String windowName = null;
      WindowDefinition winDef;
 } {
@@ -14734,11 +14986,18 @@ void windowFun(AnalyticExpression retval):{
 
         [
             LOOKAHEAD(2) <K_OVER> "("
-            [   <K_PARTITION> <K_BY>
+            [   partitionFirst=<K_PARTITION> <K_BY>
                     (LOOKAHEAD(3) expressionList=ComplexExpressionList()
                     | "(" {partitionByBrackets = true;} expressionList=ComplexExpressionList() ")" )
+                    { partitionLast = getToken(0); }
             ]
-            ")" { winDef.setPartitionExpressionList(expressionList, partitionByBrackets); retval.setType(AnalyticType.WITHIN_GROUP_OVER); }
+            ")" {
+                winDef.setPartitionExpressionList(expressionList, partitionByBrackets);
+                if (partitionFirst != null) {
+                    linkAST(winDef.getPartitionBy(), partitionFirst, partitionLast);
+                }
+                retval.setType(AnalyticType.WITHIN_GROUP_OVER);
+            }
         ]
     )
 }
@@ -14748,6 +15007,8 @@ WindowDefinition windowDefinition() : {
     List<OrderByElement> olist = null;
     WindowElement windowElement = null;
     boolean partitionByBrackets = false;
+    Token partitionFirst = null;
+    Token partitionLast = null;
     WindowDefinition winDef = new WindowDefinition();
     String baseWindowName;
 } {
@@ -14760,14 +15021,18 @@ WindowDefinition windowDefinition() : {
         |
         {}
     )
-    [<K_PARTITION> <K_BY>
+    [partitionFirst=<K_PARTITION> <K_BY>
         (LOOKAHEAD(3) expressionList=ComplexExpressionList()
         | "(" {partitionByBrackets = true;} expressionList=ComplexExpressionList() ")" )
+        { partitionLast = getToken(0); }
     ]
     [olist=OrderByElements() ]
     [windowElement = WindowElement() ]
     {
         winDef.setPartitionExpressionList(expressionList, partitionByBrackets);
+        if (partitionFirst != null) {
+            linkAST(winDef.getPartitionBy(), partitionFirst, partitionLast);
+        }
         winDef.setOrderByElements(olist);
         winDef.setWindowElement(windowElement);
     }
@@ -14932,6 +15197,7 @@ CastExpression ImplicitCast() #ImplicitCast:
 
     int precision = -1;
     int scale = -1;
+    Token first = getToken(1);
 }
 {
     colDataType = DataType()
@@ -14944,6 +15210,8 @@ CastExpression ImplicitCast() #ImplicitCast:
     )
     {
         CastExpression castExpression = new CastExpression(colDataType, tk2.image);
+        linkAST(castExpression.getLeftExpression(), tk2, tk2);
+        linkAST(castExpression, first);
         return castExpression;
     }
 }
@@ -15047,6 +15315,7 @@ WhenClause WhenThenSearchCondition():
     WhenClause whenThen = new WhenClause();
     Expression whenExp;
     Expression thenExp;
+    Token first = getToken(1);
 }
 {
     <K_WHEN> whenExp=Expression()
@@ -15059,6 +15328,7 @@ WhenClause WhenThenSearchCondition():
     {
        whenThen.setWhenExpression(whenExp);
        whenThen.setThenExpression(thenExp);
+       linkAST(whenThen, first);
        return whenThen;
     }
 }
@@ -15117,7 +15387,7 @@ ExpressionList ExecuteArguments(): {
         argument=ExecuteArgument() { arguments.add(argument); }
         ( LOOKAHEAD(2) "," argument=ExecuteArgument() { arguments.add(argument); } )*
     )
-    { return arguments; }
+    { return linkElements(arguments); }
 }
 
 Expression ExecuteArgument(): {
@@ -15172,7 +15442,7 @@ LambdaExpression LambdaExpression() #LambdaExpression:
     (
         columns = ParenthesedColumnList()
         |
-        s = RelObjectName() { columns = new ExpressionList<Column>(createColumn(s)); }
+        s = RelObjectName() { columns = linkElements(new ExpressionList<Column>(linkToLastToken(createColumn(s)))); }
     )
 
     "->"
@@ -15247,11 +15517,12 @@ Function SpecialStringFunctionWithNamedParameters() :
     NamedExpressionList namedExpressionList = null;
     ExpressionList expressionList = null;
     List<OrderByElement> orderByList;
+    Token open;
 }
 {
         funcName = <K_STRING_FUNCTION_NAME>
 
-        "("
+        open="("
         (
             LOOKAHEAD( { isNamedExprListAhead() } ) namedExpressionList = NamedExpressionListExprFirst()
             |
@@ -15260,10 +15531,13 @@ Function SpecialStringFunctionWithNamedParameters() :
         ")"
 
     {
-        return new Function()
+        if (namedExpressionList != null) {
+            linkAST(namedExpressionList, open);
+        }
+        return linked(new Function()
             .withName(funcName.image)
             .withNamedParameters(namedExpressionList)
-            .withParameters(expressionList);
+            .withParameters(expressionList), funcName);
     }
 }
 
@@ -15325,7 +15599,7 @@ Function InternalFunction(boolean escaped):
             LOOKAHEAD({ !isUnparenthesizedSelectAhead() }) expressionList = FunctionArgumentList(retval)
 
             |
-            LOOKAHEAD({ !getAsBoolean(Feature.allowUnparenthesizedSubSelects) }) expr = Select() { expressionList = new ExpressionList(expr); }
+            LOOKAHEAD({ !getAsBoolean(Feature.allowUnparenthesizedSubSelects) }) expr = Select() { expressionList = linkElements(new ExpressionList(expr)); }
         )
     ]
 
@@ -15462,7 +15736,7 @@ ExpressionList<Expression> XmlForestArguments():
 {
     expression=XmlForestArgument() { arguments.add(expression); }
     ( "," expression=XmlForestArgument() { arguments.add(expression); } )*
-    { return arguments; }
+    { return linkElements(arguments); }
 }
 
 Expression XmlForestArgument():
@@ -15528,13 +15802,14 @@ XMLSerializeExpr XMLSerializeExpr(): {
 JsonTableFunction.JsonTablePassingClause JsonTablePassingClause() : {
     Expression valueExpression;
     String parameterName;
+    Token first = getToken(1);
 }
 {
     valueExpression = Expression()
     <K_AS>
     parameterName = RelObjectName()
     {
-        return new JsonTableFunction.JsonTablePassingClause(valueExpression, parameterName);
+        return linked(new JsonTableFunction.JsonTablePassingClause(valueExpression, parameterName), first);
     }
 }
 
@@ -15568,6 +15843,7 @@ JsonTableFunction.JsonTableWrapperClause JsonTableWrapperClause(boolean beforePa
     JsonTableFunction.JsonTableWrapperClause wrapperClause =
             new JsonTableFunction.JsonTableWrapperClause(beforePathExpr);
     Token token;
+    Token first = getToken(1);
 }
 {
     (
@@ -15597,13 +15873,14 @@ JsonTableFunction.JsonTableWrapperClause JsonTableWrapperClause(boolean beforePa
     [ <K_ARRAY_LITERAL> { wrapperClause.setArray(true); } ]
     JsonKeyword("WRAPPER")
     {
-        return wrapperClause;
+        return linked(wrapperClause, first);
     }
 }
 
 JsonTableFunction.JsonTableQuotesClause JsonTableQuotesClause() : {
     JsonTableFunction.JsonTableQuotesClause quotesClause =
             new JsonTableFunction.JsonTableQuotesClause();
+    Token first = getToken(1);
 }
 {
     (
@@ -15616,7 +15893,7 @@ JsonTableFunction.JsonTableQuotesClause JsonTableQuotesClause() : {
         <K_ON> JsonKeyword("SCALAR") <K_STRING> { quotesClause.setOnScalarString(true); }
     ]
     {
-        return quotesClause;
+        return linked(quotesClause, first);
     }
 }
 
@@ -15635,6 +15912,7 @@ JsonTableFunction.JsonTableColumnDefinition JsonTableColumnDefinition() : {
     String encoding;
     String collation;
     Token collationLiteral;
+    Token first = getToken(1);
 }
 {
     (
@@ -15735,7 +16013,7 @@ JsonTableFunction.JsonTableColumnDefinition JsonTableColumnDefinition() : {
         )
     )
     {
-        return columnDefinition;
+        return linked(columnDefinition, first);
     }
 }
 
@@ -15743,6 +16021,7 @@ JsonTableFunction.JsonTableColumnsClause JsonTableColumnsClause() : {
     JsonTableFunction.JsonTableColumnsClause columnsClause =
             new JsonTableFunction.JsonTableColumnsClause();
     JsonTableFunction.JsonTableColumnDefinition columnDefinition;
+    Token first = getToken(1);
 }
 {
     <K_COLUMNS> "("
@@ -15759,7 +16038,7 @@ JsonTableFunction.JsonTableColumnsClause JsonTableColumnsClause() : {
     ]
     ")"
     {
-        return columnsClause;
+        return linked(columnsClause, first);
     }
 }
 
@@ -15768,6 +16047,7 @@ JsonTableFunction.JsonTablePlanTerm JsonTablePlanTerm() : {
     String value;
     Expression expression;
     JsonTableFunction.JsonTablePlanExpression nestedPlanExpression;
+    Token first = getToken(1);
 }
 {
     (
@@ -15789,7 +16069,7 @@ JsonTableFunction.JsonTablePlanTerm JsonTablePlanTerm() : {
         }
     )
     {
-        return term;
+        return linked(term, first);
     }
 }
 
@@ -15798,6 +16078,7 @@ JsonTableFunction.JsonTablePlanExpression JsonTablePlanExpression() : {
             new JsonTableFunction.JsonTablePlanExpression();
     JsonTableFunction.JsonTablePlanTerm term;
     Token operator = null;
+    Token first = getToken(1);
 }
 {
     term = JsonTablePlanTerm() { planExpression.addTerm(term); }
@@ -15826,7 +16107,7 @@ JsonTableFunction.JsonTablePlanExpression JsonTablePlanExpression() : {
         term = JsonTablePlanTerm() { planExpression.addTerm(term); }
     )*
     {
-        return planExpression;
+        return linked(planExpression, first);
     }
 }
 
@@ -15834,13 +16115,14 @@ JsonTableFunction.JsonTablePlanClause JsonTablePlanClause() : {
     JsonTableFunction.JsonTablePlanClause planClause =
             new JsonTableFunction.JsonTablePlanClause();
     JsonTableFunction.JsonTablePlanExpression planExpression;
+    Token first = getToken(1);
 }
 {
     <K_PLAN>
     [ <K_DEFAULT> { planClause.setDefaultPlan(true); } ]
     "(" planExpression = JsonTablePlanExpression() ")" { planClause.setPlanExpression(planExpression); }
     {
-        return planClause;
+        return linked(planClause, first);
     }
 }
 
@@ -15848,6 +16130,7 @@ JsonTableFunction.JsonTableOnErrorClause JsonTableOnErrorClause(boolean beforeCo
     JsonTableFunction.JsonTableOnErrorClause onErrorClause =
             new JsonTableFunction.JsonTableOnErrorClause(beforeColumns);
     Token token;
+    Token first = getToken(1);
 }
 {
     (
@@ -15863,7 +16146,7 @@ JsonTableFunction.JsonTableOnErrorClause JsonTableOnErrorClause(boolean beforeCo
     )
     <K_ON> <K_ERROR>
     {
-        return onErrorClause;
+        return linked(onErrorClause, first);
     }
 }
 
@@ -15871,6 +16154,7 @@ JsonTableFunction.JsonTableOnEmptyClause JsonTableOnEmptyClause() : {
     JsonTableFunction.JsonTableOnEmptyClause onEmptyClause =
             new JsonTableFunction.JsonTableOnEmptyClause();
     Token token;
+    Token first = getToken(1);
 }
 {
     (
@@ -15886,12 +16170,13 @@ JsonTableFunction.JsonTableOnEmptyClause JsonTableOnEmptyClause() : {
     )
     <K_ON> <K_EMPTY>
     {
-        return onEmptyClause;
+        return linked(onEmptyClause, first);
     }
 }
 
 JsonTableFunction.JsonTableParsingTypeClause JsonTableParsingTypeClause() : {
     JsonTableFunction.JsonTableParsingTypeClause parsingType = new JsonTableFunction.JsonTableParsingTypeClause();
+    Token first = getToken(1);
 }
 {
     <K_TYPE>
@@ -15904,7 +16189,7 @@ JsonTableFunction.JsonTableParsingTypeClause JsonTableParsingTypeClause() : {
     )
     <CLOSING_BRACKET>
     {
-        return parsingType;
+        return linked(parsingType, first);
     }
 }
 
@@ -15930,7 +16215,7 @@ JsonTableFunction JsonTableBody() : {
         ","
         jsonPath = Expression() {
             function.setJsonPathExpression(jsonPath);
-            function.setParameters(new ExpressionList(jsonInput, jsonPath));
+            function.setParameters(linkElements(new ExpressionList(jsonInput, jsonPath)));
         }
         [ <K_AS> pathName = RelObjectName() { function.setPathName(pathName); } ]
     ]
@@ -15959,12 +16244,13 @@ XmlTableFunction.XmlTablePassingClause XmlTablePassingClause() : {
     XmlTableFunction.XmlTablePassingClause passingClause = new XmlTableFunction.XmlTablePassingClause();
     Expression valueExpression;
     String name = null;
+    Token first = getToken(1);
 }
 {
     valueExpression = Expression() { passingClause.setValueExpression(valueExpression); }
     [ <K_AS> name = RelObjectName() { passingClause.setName(name); } ]
     {
-        return passingClause;
+        return linked(passingClause, first);
     }
 }
 
@@ -15973,6 +16259,7 @@ XmlTableFunction.XmlTableColumnDefinition XmlTableColumnDefinition() : {
     String columnName;
     ColDataType dataType;
     Expression expression;
+    Token first = getToken(1);
 }
 {
     columnName = RelObjectName() { columnDefinition.setColumnName(columnName); }
@@ -15984,7 +16271,7 @@ XmlTableFunction.XmlTableColumnDefinition XmlTableColumnDefinition() : {
         [ <K_DEFAULT> expression = Expression() { columnDefinition.setDefaultExpression(expression); } ]
     )
     {
-        return columnDefinition;
+        return linked(columnDefinition, first);
     }
 }
 
@@ -16026,6 +16313,7 @@ TableFunction TableFunction():
     Function function = null;
     ParenthesedExpressionList<Function> rowsFromFunctions = null;
     Token withClause = null;
+    Token keyword;
 }
 {
     [ prefix = <K_LATERAL> ]
@@ -16036,15 +16324,15 @@ TableFunction TableFunction():
             getToken(1).kind == S_IDENTIFIER
                 && getToken(1).image.equalsIgnoreCase("JSON_TABLE")
         })
-        JsonKeyword("JSON_TABLE")
-        function = JsonTableBody()
+        JsonKeyword("JSON_TABLE") { keyword = getToken(0); }
+        function = JsonTableBody() { linkAST(function, keyword); }
         |
         LOOKAHEAD({
             getToken(1).kind == S_IDENTIFIER
                 && getToken(1).image.equalsIgnoreCase("XMLTABLE")
         })
-        <S_IDENTIFIER>
-        function = XmlTableBody()
+        keyword=<S_IDENTIFIER>
+        function = XmlTableBody() { linkAST(function, keyword); }
         |
         function=Function()
     )
@@ -16074,6 +16362,7 @@ ParenthesedExpressionList<Function> RowsFromFunctionList():
 {
     ParenthesedExpressionList<Function> functions = new ParenthesedExpressionList<Function>();
     Function function;
+    Token first = getToken(1);
 }
 {
     "("
@@ -16084,6 +16373,7 @@ ParenthesedExpressionList<Function> RowsFromFunctionList():
         )*
     ")"
     {
+        linkAST(functions, first);
         return functions;
     }
 }
@@ -16754,6 +17044,7 @@ StringValue MySqlAccountNamePart():
                     ? new StringValue().withValue(name.substring(1, name.length() - 1))
                             .setQuoteStr(name.substring(0, 1))
                     : new StringValue().withValue(name).setQuoteStr("");
+            linkToLastToken(value);
         }
     )
     { return value; }
@@ -17419,7 +17710,7 @@ void MySqlDefiner(MySqlDefiner definer):
     ContextualKeyword("DEFINER") "="
     (
         LOOKAHEAD({ isKeywordAhead("CURRENT_USER") }) name=RelObjectName()
-        { definer.setUser(new StringValue(name).setQuoteStr("")); }
+        { definer.setUser(linkToLastToken(new StringValue(name).setQuoteStr(""))); }
         [ "(" ")" { definer.setCurrentUserParentheses(true); } ]
         |
         account=MySqlAccountName() { definer.setUser(account.getUser()); definer.setHost(account.getHost()); }
@@ -17498,13 +17789,14 @@ Statement MySqlTriggerBody():
 {
     Statement body;
     List<String> tokens;
+    Token first = getToken(1);
 }
 {
     (
         LOOKAHEAD({ isStatementBlockAhead() }) body=BeginEndBlock()
         |
         LOOKAHEAD({ isMySqlCompoundStatementAhead() }) tokens=captureCompoundStatement()
-        { body = new UnsupportedStatement(tokens); }
+        { body = linked(new UnsupportedStatement(tokens), first); }
         |
         body=SingleStatement()
     )
@@ -18208,7 +18500,7 @@ TableElement TableConstraint(boolean createContext):
 NotNullConstraint PostgreSqlNotNullConstraint():
 { NotNullConstraint constraint = new NotNullConstraint(); String name; boolean noInherit; }
 {
-    <K_NOT> <K_NULL> name=RelObjectName() { constraint.setColumn(createColumn(name)); }
+    <K_NOT> <K_NULL> name=RelObjectName() { constraint.setColumn(linkToLastToken(createColumn(name))); }
     noInherit=PostgreSqlNoInheritClause() { constraint.setNoInherit(noInherit); }
     { return constraint; }
 }
@@ -18279,6 +18571,7 @@ KeyElement PostgreSqlExcludeElement():
 CreateTable CreateTable(boolean isUsingOrReplace):
 {
     CreateTable createTable = new CreateTable();
+    Token ofFirst;
     Table table = null;
     List<TableElement> tableElements = new ArrayList<TableElement>();
     TableElement element;
@@ -18325,9 +18618,10 @@ CreateTable CreateTable(boolean isUsingOrReplace):
         [ LOOKAHEAD(2) tableColumn=TimeTravelAfterAlias() { likeTable.setTimeTravel(tableColumn); } ]
         { createTable.setCloneTable(likeTable); likeTable = null; }
     ]
-    [ <K_OF> typeName=RelObjectNames() {
+    [ <K_OF> { ofFirst = getToken(1); } typeName=RelObjectNames() {
         ofType = new ColDataType();
         ofType.setDataType(typeName.getNames());
+        linkAST(ofType, ofFirst);
         createTable.setOfType(ofType);
     } ]
     [ LOOKAHEAD(2) <K_PARTITION> <K_OF> partitionOfTable=Table()
@@ -18812,11 +19106,11 @@ AlterExpressionOrderBy MySqlAlterOrderBy():
 }
 
 OrderByElement MySqlAlterOrderColumn():
-{ OrderByElement element = new OrderByElement(); String name; Token order; }
+{ OrderByElement element = new OrderByElement(); String name; Token order; Token first = getToken(1); }
 {
-    name=RelObjectName() { element.setExpression(createColumn(name)); }
+    name=RelObjectName() { element.setExpression(linkToLastToken(createColumn(name))); }
     [ LOOKAHEAD(2) ( order=<K_ASC> | order=<K_DESC> ) { element.setAsc(order.kind == K_ASC); element.setAscDescPresent(true); } ]
-    { return element; }
+    { linkAST(element, first); return element; }
 }
 
 String MySqlTableOptionValue(): {
@@ -18871,12 +19165,13 @@ ColDataType DataType():
     String precision = null;
     Integer scale = null;
     String scaleText;
+    Token first = getToken(1);
 }
 {
     (
         LOOKAHEAD(2) tk=<K_TEXT_LITERAL> {
             type = tk.image;
-            return ColDataType.fromTypeParameters(type, precision, scale);
+            return linked(ColDataType.fromTypeParameters(type, precision, scale), first);
         }
         |
 		LOOKAHEAD(2) tk=<K_ARRAY_LITERAL> (
@@ -18918,7 +19213,7 @@ ColDataType DataType():
     )
 
     {
-        return colDataType;
+        return linked(colDataType, first);
     }
 }
 
@@ -18973,6 +19268,7 @@ ColDataType ColDataType():
     Token varying = null;
     ColDataType.TypeModifier typeModifier = null;
     XmlTypeModifier xmlTypeModifier = null;
+    Token first = getToken(1);
 }
 {
     (
@@ -19151,6 +19447,7 @@ ColDataType ColDataType():
         if (zonePrecision != null) {
             colDataType.setPrecision(zonePrecision);
         }
+        linkAST(colDataType, first);
         return colDataType;
     }
 }
@@ -19433,7 +19730,7 @@ ExpressionList<Column> ColumnWithCommentList():
          ( "," img=Column() { expressions.add(img); } )*
     ")"
     {
-        return expressions;
+        return linkElements(expressions);
     }
 }
 
@@ -20939,7 +21236,7 @@ DefaultConstraint DefaultConstraintSpec():
 {
     [ <K_CONSTRAINT> name=RelObjectName() { constraint.setName(name); } ]
     <K_DEFAULT> expression=Expression() { constraint.setExpression(expression); }
-    <K_FOR> name=RelObjectName() { constraint.setColumn(createColumn(name)); }
+    <K_FOR> name=RelObjectName() { constraint.setColumn(linkToLastToken(createColumn(name))); }
     // See InsertBulk(): <K_WITH> is in the FOLLOW set of every statement tail. WITH VALUES wins
     // over a hypothetical CTE named VALUES, which is the useful reading here.
     [ LOOKAHEAD(2) <K_WITH> <K_VALUES> { constraint.setWithValues(true); } ]
@@ -22957,7 +23254,7 @@ ConfigurationParameterChange ConfigurationParameterChange():
 
 Expression AccessSettingValue():
 { Expression value; Token token; }
-{ ( LOOKAHEAD(1) token=<K_ON> { value = new Column(token.image); } | value=PrimaryExpression() ) { return value; } }
+{ ( LOOKAHEAD(1) token=<K_ON> { value = linkToLastToken(new Column(token.image)); } | value=PrimaryExpression() ) { return value; } }
 
 /** PostgreSQL and MySQL static privileges; another identifier is a MySQL dynamic privilege. */
 Privilege AccessPrivilege():
@@ -23002,9 +23299,9 @@ Privilege AccessPrivilege():
     [ LOOKAHEAD({ isAccessKeywordAhead("PRIVILEGES") })
       AccessKeyword("PRIVILEGES") { requireAccessSyntax(result.getKind() == Privilege.Kind.ALL, "PRIVILEGES requires ALL"); result.setUsePrivileges(true); } ]
     [ "(" { columns = new ExpressionList<Column>(); }
-      column=RelObjectName() { columns.add(new Column(column)); }
-      ( "," column=RelObjectName() { columns.add(new Column(column)); } )*
-      ")" { result.setColumns(columns); } ]
+      column=RelObjectName() { columns.add(linkToLastToken(new Column(column))); }
+      ( "," column=RelObjectName() { columns.add(linkToLastToken(new Column(column))); } )*
+      ")" { result.setColumns(linkElements(columns)); } ]
     { return result; }
 }
 
@@ -23237,9 +23534,9 @@ TriggerEvent PostgreSqlTriggerEvent():
         | <K_TRUNCATE> { result = new TriggerEvent(CreateTrigger.Event.TRUNCATE); }
         | <K_UPDATE> { result = new TriggerEvent(CreateTrigger.Event.UPDATE); }
           [ <K_OF> { columns = new ExpressionList<Column>(); }
-            name=RelObjectName() { columns.add(createColumn(name)); }
-            ( "," name=RelObjectName() { columns.add(createColumn(name)); } )*
-            { result.setColumns(columns); } ]
+            name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); }
+            ( "," name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); } )*
+            { result.setColumns(linkElements(columns)); } ]
     )
     { return result; }
 }
@@ -23331,7 +23628,7 @@ Expression PostgreSqlTriggerArgument():
         token=<S_CHAR_LITERAL> { result = stringValue(token); }
         | token=<S_LONG> { result = new LongValue(token.image); }
         | token=<S_DOUBLE> { result = new DoubleValue(token.image); }
-        | name=RelObjectName() { result = createColumn(name); }
+        | name=RelObjectName() { result = linkToLastToken(createColumn(name)); }
     )
     { return result; }
 }
@@ -23517,7 +23814,12 @@ void SequenceDefinitionOptions(Sequence sequence):
             parameter=SequenceParameter() { parameters.add(parameter); }
         )
     )*
-    { sequence.setParameters(parameters); }
+    {
+        sequence.setParameters(parameters);
+        if (!parameters.isEmpty() || sequence.getOwnership() != null) {
+            widen(sequence, null, getToken(0));
+        }
+    }
 }
 
 CreateSequence CreateSequence():
@@ -24045,7 +24347,7 @@ Expression ExtensionVersion():
 { Token token; String name; Expression result; }
 {
     ( token=<S_CHAR_LITERAL> { result = stringValue(token); }
-      | name=RelObjectName() { result = createColumn(name); } )
+      | name=RelObjectName() { result = linkToLastToken(createColumn(name)); } )
     { return result; }
 }
 
@@ -24446,7 +24748,7 @@ void ReplicationKeyword(String expected):
 Expression ReplicationOptionValue():
 { Token token; Expression result; }
 {
-    ( LOOKAHEAD(1) token=<K_ON> { result = new Column(token.image); } | result=PrimaryExpression() )
+    ( LOOKAHEAD(1) token=<K_ON> { result = linkToLastToken(new Column(token.image)); } | result=PrimaryExpression() )
     { return result; }
 }
 
@@ -24487,9 +24789,9 @@ PublicationTable PublicationTable(boolean drop):
     table=Table() { result.setTable(table); }
     [ "*" { result.setIncludeDescendants(true); } ]
     [ LOOKAHEAD(1) "(" { columns = new ExpressionList<Column>(); }
-      name=RelObjectName() { columns.add(createColumn(name)); }
-      ( "," name=RelObjectName() { columns.add(createColumn(name)); } )* ")"
-      { result.setColumns(columns); } ]
+      name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); }
+      ( "," name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); } )* ")"
+      { result.setColumns(linkElements(columns)); } ]
     [ <K_WHERE> "(" expression=Expression() ")" { result.setWhere(expression); } ]
     {
         requireReplicationSyntax(!(result.isOnly() && result.isIncludeDescendants()), "ONLY and * cannot be combined");
@@ -24669,11 +24971,12 @@ DropPolicy DropPolicy():
 UnsupportedStatement UnsupportedStatement():
 {
   List<String> tokens = new LinkedList<String>();
+  Token first = getToken(1);
 }
 {
   tokens=captureUnsupportedStatementDeclaration()
   {
-    return new UnsupportedStatement(tokens);
+    return linked(new UnsupportedStatement(tokens), first);
   }
 }
 
@@ -25132,10 +25435,10 @@ CreateStatistics CreateStatistics():
     }
 }
 Expression PostgreSqlStatisticsExpression():
-{ Expression expression; String name; }
+{ Expression expression; String name; Token open; }
 {
-    ( "(" expression=Expression() ")" { expression = new ParenthesedExpressionList<Expression>(expression); }
-      | name=RelObjectName() { expression = createColumn(name); } )
+    ( open="(" expression=Expression() ")" { expression = new ParenthesedExpressionList<Expression>(expression); linkAST((ASTNodeAccess) expression, open); }
+      | name=RelObjectName() { expression = linkToLastToken(createColumn(name)); } )
     { return expression; }
 }
 AlterStatistics AlterStatistics():
diff --git a/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
new file mode 100644
index 0000000000..1f5f1758ca
--- /dev/null
+++ b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
@@ -0,0 +1,327 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2026 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.parser;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.AnalyticExpression;
+import net.sf.jsqlparser.expression.CaseExpression;
+import net.sf.jsqlparser.expression.CastExpression;
+import net.sf.jsqlparser.expression.ConnectByPriorOperator;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.create.sequence.CreateSequence;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Every object a parse returns that implements {@link ASTNodeAccess} maps back to its source text.
+ * Its node spans at least one character, inside the range of the object that holds it. No two
+ * ranges in a statement partly overlap, and the text of an expression's range parses to that
+ * expression again. The model is walked through its getters, over the SQL files of the test
+ * resources.
+ */
+public class ASTNodeCoverageTest {
+    private static final Path CORPUS = Paths.get("src/test/resources");
+
+    @Test
+    public void testEveryParsedNodeMapsBackToItsSource() throws IOException {
+        Map<String, String> problems = new TreeMap<>();
+        for (Path file : sqlFiles()) {
+            String sql = Files.readString(file);
+            Object statements;
+            try {
+                // a statement the parser rejects leaves the rest of its file to check
+                statements =
+                        CCJSqlParserUtil.parseStatements(sql, parser -> parser.withErrorRecovery());
+            } catch (JSQLParserException e) {
+                // the corpus also holds SQL the parser rejects
+                continue;
+            }
+            new Walk(file, sql, problems).check(statements);
+        }
+        assertThat(problems).isEmpty();
+    }
+
+    @Test
+    public void testRangesOfStatementsClausesAndTypes() throws JSQLParserException {
+        String sql = "WITH t AS (SELECT 1) SELECT * FROM t;";
+        assertSpans("WITH t AS (SELECT 1) SELECT * FROM t", sql, (ASTNodeAccess) statement(sql));
+
+        sql = "UPDATE t SET a = 1 WHERE b = 2";
+        assertSpans(sql, sql, (ASTNodeAccess) statement(sql));
+
+        sql = "BEGIN SELECT 1; END;";
+        assertSpans(sql, sql, (ASTNodeAccess) statement(sql));
+
+        sql = "FOO BAR BAZ";
+        assertSpans(sql, sql, (ASTNodeAccess) CCJSqlParserUtil.parse(sql,
+                parser -> parser.withUnsupportedStatements(true)));
+
+        sql = "SELECT /*+ INDEX(t i) */ a FROM t";
+        assertSpans("/*+ INDEX(t i) */", sql, ((PlainSelect) statement(sql)).getOracleHint());
+
+        sql = "SELECT CASE WHEN a = 1 THEN 'x' END, CAST(a AS DECIMAL(10, 2)), s.t.c,"
+                + " ROW_NUMBER() OVER (PARTITION BY a ORDER BY b), SUBSTRING(a FROM 2 FOR 3)"
+                + " FROM t ORDER BY a DESC NULLS LAST";
+        PlainSelect select = (PlainSelect) statement(sql);
+        assertSpans("WHEN a = 1 THEN 'x'", sql,
+                ((CaseExpression) item(select, 0)).getWhenClauses().get(0));
+        assertSpans("DECIMAL(10, 2)", sql, ((CastExpression) item(select, 1)).getColDataType());
+        assertSpans("s.t", sql, ((Column) item(select, 2)).getTable());
+        assertSpans("PARTITION BY a", sql,
+                (ASTNodeAccess) ((AnalyticExpression) item(select, 3))
+                        .getPartitionExpressionList());
+        // the list prints the parentheses of its function
+        assertSpans("(a FROM 2 FOR 3)", sql, ((Function) item(select, 4)).getNamedParameters());
+        assertSpans("a DESC NULLS LAST", sql, select.getOrderByElements().get(0));
+
+        sql = "SELECT * FROM a, b WHERE a.id(+) = b.id";
+        assertSpans("a.id(+)", sql,
+                ((EqualsTo) ((PlainSelect) statement(sql)).getWhere()).getLeftExpression());
+
+        sql = "SELECT id FROM t LIMIT 5 BY id";
+        assertSpans("LIMIT 5 BY id", sql, ((PlainSelect) statement(sql)).getLimitBy());
+
+        sql = "CREATE SEQUENCE s INCREMENT BY 1 OWNED BY t.c";
+        assertSpans("s INCREMENT BY 1 OWNED BY t.c", sql,
+                ((CreateSequence) statement(sql)).getSequence());
+
+        sql = "SELECT 'a'\n'b'";
+        Statement merged = CCJSqlParserUtil.parse(sql, parser -> parser.withAdjacentStringLiterals(
+                AbstractJSqlParser.AdjacentStringLiterals.NEWLINE));
+        assertSpans("'a'\n'b'", sql, item((PlainSelect) merged, 0));
+    }
+
+    private static Statement statement(String sql) throws JSQLParserException {
+        return CCJSqlParserUtil.parse(sql);
+    }
+
+    private static Expression item(PlainSelect select, int index) {
+        return select.getSelectItem(index).getExpression();
+    }
+
+    private static void assertSpans(String expected, String sql, ASTNodeAccess part) {
+        Node node = part.getASTNode();
+        assertEquals(expected, sql.substring(node.jjtGetFirstToken().absoluteBegin - 1,
+                node.jjtGetLastToken().absoluteEnd - 1), part.getClass().getSimpleName());
+    }
+
+    private static List<Path> sqlFiles() throws IOException {
+        try (Stream<Path> files = Files.walk(CORPUS)) {
+            return files.filter(file -> file.toString().endsWith(".sql")).sorted()
+                    .collect(Collectors.toList());
+        }
+    }
+
+    private static final class Walk {
+        private final Path file;
+        private final String sql;
+        private final Map<String, String> problems;
+        private final Set<Object> visited = Collections.newSetFromMap(new IdentityHashMap<>());
+        private final List<Object[]> ranges = new ArrayList<>();
+
+        Walk(Path file, String sql, Map<String, String> problems) {
+            this.file = file;
+            this.sql = sql;
+            this.problems = problems;
+        }
+
+        void check(Object statements) {
+            visit(statements, null);
+            checkNoPartialOverlap();
+        }
+
+        private void visit(Object value, int[] enclosing) {
+            if (value == null || !visited.add(value)) {
+                return;
+            }
+            int[] range = range(value);
+            if (range != null) {
+                checkRange(value, range, enclosing);
+            }
+            int[] inner = range != null ? range : enclosing;
+            if (value instanceof Collection) {
+                for (Object element : (Collection<?>) value) {
+                    visit(element, inner);
+                }
+            } else if (value instanceof Map) {
+                for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
+                    visit(entry.getKey(), inner);
+                    visit(entry.getValue(), inner);
+                }
+            } else if (value instanceof Map.Entry) {
+                visit(((Map.Entry<?, ?>) value).getKey(), inner);
+                visit(((Map.Entry<?, ?>) value).getValue(), inner);
+            } else if (value instanceof Optional) {
+                ((Optional<?>) value).ifPresent(present -> visit(present, inner));
+            }
+            if (isModel(value)) {
+                for (Method getter : value.getClass().getMethods()) {
+                    if (isChildGetter(getter)) {
+                        visitChild(value, getter, inner);
+                    }
+                }
+            }
+        }
+
+        private void visitChild(Object value, Method getter, int[] enclosing) {
+            try {
+                Object child = getter.invoke(value);
+                if (isHeld(child, getter.invoke(value))) {
+                    visit(child, enclosing);
+                }
+            } catch (ReflectiveOperationException | RuntimeException e) {
+                // a getter that cannot answer for this object has no child to walk
+            }
+        }
+
+        /**
+         * The object's range, or null when it has none, reporting an object that should have one.
+         */
+        private int[] range(Object value) {
+            // an object that prints as nothing, such as a clause left at its default, has no text
+            if (!(value instanceof ASTNodeAccess) || value.toString().isBlank()) {
+                return null;
+            }
+            Node node = ((ASTNodeAccess) value).getASTNode();
+            if (node == null) {
+                report("has no node", value);
+                return null;
+            }
+            if (node.parser != null) {
+                report("keeps its parser alive", value);
+            }
+            int begin = node.jjtGetFirstToken().absoluteBegin - 1;
+            int end = node.jjtGetLastToken().absoluteEnd - 1;
+            if (begin < 0 || end <= begin || end > sql.length()) {
+                report("spans no text", value);
+                return null;
+            }
+            return new int[] {begin, end};
+        }
+
+        private void checkRange(Object value, int[] range, int[] enclosing) {
+            if (enclosing != null && (range[0] < enclosing[0] || range[1] > enclosing[1])) {
+                report("lies outside the object that holds it", value);
+            }
+            ranges.add(new Object[] {range, value});
+            String text = sql.substring(range[0], range[1]);
+            // PRIOR is an operator only inside CONNECT BY
+            if (value instanceof Expression && !(value instanceof ConnectByPriorOperator)) {
+                checkReparses(value, text,
+                        expression -> CCJSqlParserUtil.parseExpression(expression, false));
+            } else if (value instanceof Statement) {
+                checkReparses(value, text, CCJSqlParserUtil::parse);
+            }
+        }
+
+        private void checkReparses(Object value, String text, Parse parse) {
+            Object again;
+            try {
+                again = parse.apply(text);
+            } catch (JSQLParserException e) {
+                // text that needs its surroundings to parse proves nothing
+                return;
+            }
+            if (again != null
+                    && !normalized(again.toString()).equals(normalized(value.toString()))) {
+                report("reparses to something else", value, value + " reparses to " + again);
+            }
+        }
+
+        // sorted by start, the longer first, ranges nest when each ends inside the one still open
+        private void checkNoPartialOverlap() {
+            ranges.sort(Comparator.<Object[]>comparingInt(entry -> ((int[]) entry[0])[0])
+                    .thenComparingInt(entry -> -((int[]) entry[0])[1]));
+            Deque<Object[]> open = new ArrayDeque<>();
+            for (Object[] entry : ranges) {
+                int[] range = (int[]) entry[0];
+                while (!open.isEmpty() && ((int[]) open.peek()[0])[1] <= range[0]) {
+                    open.pop();
+                }
+                if (!open.isEmpty() && ((int[]) open.peek()[0])[1] < range[1]) {
+                    report("partly overlaps " + open.peek()[1].getClass().getSimpleName(),
+                            entry[1], entry[1]);
+                }
+                open.push(entry);
+            }
+        }
+
+        private void report(String problem, Object value) {
+            report(problem, value, value);
+        }
+
+        private void report(String problem, Object value, Object detail) {
+            problems.putIfAbsent(value.getClass().getSimpleName() + " " + problem,
+                    file + ": " + detail);
+        }
+    }
+
+    private interface Parse {
+        Object apply(String text) throws JSQLParserException;
+    }
+
+    private static String normalized(String text) {
+        return text.replaceAll("\\s+", "").toUpperCase(Locale.ROOT);
+    }
+
+    // a getter that builds new objects on each call computes them rather than holding them
+    private static boolean isHeld(Object child, Object again) {
+        if (child instanceof ASTNodeAccess) {
+            return child == again;
+        }
+        if (child instanceof Collection && !((Collection<?>) child).isEmpty()) {
+            return again instanceof Collection && !((Collection<?>) again).isEmpty()
+                    && ((Collection<?>) child).iterator().next() == ((Collection<?>) again)
+                            .iterator().next();
+        }
+        return true;
+    }
+
+    private static boolean isModel(Object value) {
+        String name = value.getClass().getName();
+        return name.startsWith("net.sf.jsqlparser.")
+                && !name.startsWith("net.sf.jsqlparser.parser.")
+                && !(value instanceof Enum);
+    }
+
+    private static boolean isChildGetter(Method method) {
+        return method.getParameterCount() == 0 && method.getName().startsWith("get")
+                && !Modifier.isStatic(method.getModifiers())
+                && !method.getName().equals("getParent") && !method.getName().equals("getASTNode");
+    }
+}

From 927c72481a0ff3c62f92d3a475e83ca2ecc3c9f2 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@gmail.com>
Date: Thu, 29 Oct 2026 04:30:31 +0100
Subject: [PATCH 4/7] fix: link statements nested in others, and position every
 comment

Statements that never pass through SingleStatement get their node where
they are built: data-modifying CTEs, statements inside an Oracle block,
CREATE SCHEMA elements, CREATE TABLE ... AS EXECUTE and the GRANT or
REVOKE of ALTER DEFAULT PRIVILEGES. An IF statement's range takes in the
semicolon it prints.

A RangeNode that widens a tree node answers its children, id and dump
too, so a WITH statement's node still shows the tree beneath it.

Comments are positioned in one backwards pass over the recorded match
begins, and comments before the end of input are positioned once
parsing ends, since the end-of-file token gets no token action.

Values in a primary expression, string literals, expression lists and
row patterns get a RangeNode only once something wraps them, so a
production's own tree node is the only node most of them get. On a
20,000-row INSERT ... VALUES this cuts the added allocation from 12.9%
to 3.2%.

The coverage test parses the Oracle tests in the Oracle dialect, checks
that getParent() encloses each range, and runs its checks over the
statements above, which the test corpus does not contain.
---
 .../net/sf/jsqlparser/parser/RangeNode.java   |  42 ++++-
 .../jsqlparser/parser/SimpleCharStream.java   |  29 ++--
 .../net/sf/jsqlparser/parser/JSqlParserCC.jjt | 155 +++++++++++-------
 .../parser/ASTNodeCoverageTest.java           |  71 ++++++--
 4 files changed, 214 insertions(+), 83 deletions(-)

diff --git a/src/main/java/net/sf/jsqlparser/parser/RangeNode.java b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
index 909148fc87..25df9e546d 100644
--- a/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
+++ b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
@@ -12,7 +12,7 @@
 /**
  * A node outside the parse tree that records the tokens an object spans. It serves an object no
  * grammar rule opens a tree node for, or one whose text runs past its tree node. In that second
- * case it answers the tree node's parent, which the object's {@code getParent()} then reports.
+ * case it stands in for the tree node, answering its parent, children and id, with the wider range.
  */
 public final class RangeNode extends Node {
     private final Node treeNode;
@@ -28,4 +28,44 @@ public RangeNode(Token first, Token last, Node treeNode) {
     public Node jjtGetParent() {
         return treeNode == null ? null : treeNode.jjtGetParent();
     }
+
+    @Override
+    public Node[] jjtGetChildren() {
+        return treeNode == null ? super.jjtGetChildren() : treeNode.jjtGetChildren();
+    }
+
+    @Override
+    public Node jjtGetChild(int i) {
+        return treeNode == null ? super.jjtGetChild(i) : treeNode.jjtGetChild(i);
+    }
+
+    @Override
+    public int jjtGetNumChildren() {
+        return treeNode == null ? super.jjtGetNumChildren() : treeNode.jjtGetNumChildren();
+    }
+
+    @Override
+    public Object childrenAccept(CCJSqlParserVisitor visitor, Object data) {
+        return treeNode == null ? super.childrenAccept(visitor, data)
+                : treeNode.childrenAccept(visitor, data);
+    }
+
+    @Override
+    public int getId() {
+        return treeNode == null ? super.getId() : treeNode.getId();
+    }
+
+    @Override
+    public String toString() {
+        return treeNode == null ? super.toString() : treeNode.toString();
+    }
+
+    @Override
+    public void dump(String prefix) {
+        if (treeNode == null) {
+            super.dump(prefix);
+        } else {
+            treeNode.dump(prefix);
+        }
+    }
 }
diff --git a/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java b/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
index 7a7dd60a78..5b6c5e8259 100644
--- a/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
+++ b/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
@@ -48,7 +48,7 @@ public class SimpleCharStream {
     protected boolean trackLineColumn = true;
     protected int totalCharsRead = 0;
     protected int absoluteTokenBegin = 0;
-    // line, column and absolute position of each match begun since the last forgetMatchBegins()
+    // line, column and absolute position of each match begun since the last positionSpecialTokens()
     private int[] matchBegins = new int[24];
     private int matchBeginCount = 0;
     int bufsize;
@@ -111,20 +111,25 @@ public final int getAbsoluteTokenBegin() {
     }
 
     /**
-     * The absolute position of the match that began at the given line and column since the last
-     * {@link #forgetMatchBegins()}, or 0 when none did. Lets a comment, which no token action sees,
-     * take its position from where its match began.
+     * Gives the comments in front of {@code token} the positions where their matches began, from
+     * the begins recorded since the last call, and forgets those. Comments come through no token
+     * action, so this is how they get a position. The comments chain backwards from the token while
+     * the begins are recorded forwards, so one backwards pass pairs them.
      */
-    public final int getAbsoluteBegin(int line, int column) {
-        for (int i = 0; i < matchBeginCount; i += 3) {
-            if (matchBegins[i] == line && matchBegins[i + 1] == column) {
-                return matchBegins[i + 2];
+    public final void positionSpecialTokens(Token token) {
+        int i = matchBeginCount - 3;
+        for (Token comment = token.specialToken; comment != null; comment = comment.specialToken) {
+            while (i >= 0 && (matchBegins[i] != comment.beginLine
+                    || matchBegins[i + 1] != comment.beginColumn)) {
+                i -= 3;
             }
+            if (i < 0) {
+                break;
+            }
+            comment.absoluteBegin = matchBegins[i + 2];
+            comment.absoluteEnd = comment.absoluteBegin + comment.image.length();
+            i -= 3;
         }
-        return 0;
-    }
-
-    public final void forgetMatchBegins() {
         matchBeginCount = 0;
     }
 
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index cbd2cdd6c4..b2bf434461 100644
--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -356,6 +356,13 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
         }
     }
 
+    /** Links a statement that no other rule linked to the range from {@code first} on. */
+    private void linkStatement(Statement statement, Token first) {
+        if (statement instanceof ASTNodeAccess) {
+            linkASTIfMissing((ASTNodeAccess) statement, first);
+        }
+    }
+
     /**
      * The last token of the qualifier in a dotted name running from {@code first} to {@code name},
      * which is the token two before {@code name}. Null when the name has no qualifier.
@@ -3554,8 +3561,13 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
      * PostgreSQL escape string with a Unicode escape that the server rejects is rejected as well.
      */
     private StringValue stringValue(Token token) throws ParseException {
-        StringValue value = new StringValue(token.image);
+        StringValue value = unlinkedStringValue(token);
         linkAST(value, token, token);
+        return value;
+    }
+
+    private StringValue unlinkedStringValue(Token token) throws ParseException {
+        StringValue value = new StringValue(token.image);
         // a U&'...' string brings its own escaping
         if (value.getQuoteStr() == null || value.getQuoteStr().startsWith("$")
                 || value.getEscaping() == StringValue.Escaping.POSTGRESQL_UNICODE_ESCAPE) {
@@ -3781,15 +3793,8 @@ TOKEN_MGR_DECLS : {
 	{
 		t.absoluteBegin = getCurrentTokenAbsolutePosition();
 		t.absoluteEnd = t.absoluteBegin + t.image.length();
-        // comments come through no token action, so they take their position from where their match began
-        if (input_stream instanceof SimpleCharStream) {
-            SimpleCharStream stream = (SimpleCharStream) input_stream;
-            for (Token comment = t.specialToken; comment != null; comment = comment.specialToken) {
-                comment.absoluteBegin = stream.getAbsoluteBegin(comment.beginLine, comment.beginColumn);
-                comment.absoluteEnd = comment.absoluteBegin + comment.image.length();
-            }
-            stream.forgetMatchBegins();
-        }
+        positionComments(t);
+        lastToken = t;
         // Track the lexical region independently of parser lookahead: nested SELECT
         // disambiguation can fetch PATTERN tokens before its production is entered.
         if (rowPatternContext == null && t.kind == S_IDENTIFIER
@@ -3803,6 +3808,26 @@ TOKEN_MGR_DECLS : {
         }
 	}
 
+    // the last token handed out with a token action, whose successor is the first end-of-file token
+    private Token lastToken;
+
+    /**
+     * Gives the comments before the end of input their positions. The end-of-file token gets no
+     * token action, and it is the first one after the last token that does which holds them.
+     */
+    public void positionTrailingComments() {
+        if (lastToken != null && lastToken.next != null && lastToken.next.kind == EOF) {
+            positionComments(lastToken.next);
+        }
+    }
+
+    /** Gives the comments in front of a token their positions. */
+    public void positionComments(Token t) {
+        if (input_stream instanceof SimpleCharStream) {
+            ((SimpleCharStream) input_stream).positionSpecialTokens(t);
+        }
+    }
+
 	public int getCurrentTokenAbsolutePosition()
 	{
 		if (input_stream instanceof SimpleCharStream)
@@ -4883,6 +4908,7 @@ Statement Statement() #Statement:
                            ifElseStatement.setUsingSemicolonForElseStatement(true);
                         else if (ifElseStatement!=null)
                            ifElseStatement.setUsingSemicolonForIfStatement(true);
+                       widen(ifElseStatement, null, getToken(0));
                      }
                  ]
                  <EOF>
@@ -4911,6 +4937,7 @@ Statement Statement() #Statement:
     )
 
 	{
+		token_source.positionTrailingComments();
 		return ifElseStatement!=null ? ifElseStatement : stm;
 	}
 }
@@ -5089,9 +5116,7 @@ Statement SingleStatement() :
             LOOKAHEAD({ Dialect.EXASOL.name().equals(getAsString(Feature.dialect)) }) ( stm = Import() | stm = Export() )
         )
         {
-            if (stm instanceof ASTNodeAccess) {
-                linkASTIfMissing((ASTNodeAccess) stm, first);
-            }
+            linkStatement(stm, first);
             return stm;
         }
 }
@@ -5142,7 +5167,7 @@ Statements OracleBlockStatements():
 }
 
 Statement OracleBlockStatement():
-{ Statement statement; Expression target; Expression value; }
+{ Statement statement; Expression target; Expression value; Token first = getToken(1); }
 {
     (
         LOOKAHEAD({ getToken(1).kind == K_DECLARE || getToken(1).kind == K_BEGIN }) statement=OracleBlock()
@@ -5155,7 +5180,7 @@ Statement OracleBlockStatement():
           statement=OracleImplicitCall()
         | statement=SingleStatement()
     )
-    { return statement; }
+    { linkStatement(statement, first); return statement; }
 }
 
 Execute OracleImplicitCall():
@@ -5296,6 +5321,7 @@ Statements Statements() #Statements: {
                                ifElseStatement.setUsingSemicolonForElseStatement(true);
                             else if (ifElseStatement!=null)
                                ifElseStatement.setUsingSemicolonForIfStatement(true);
+                           widen(ifElseStatement, null, getToken(0));
                          }
                      ]
                 )
@@ -5361,6 +5387,7 @@ Statements Statements() #Statements: {
                              ifElseStatement.setUsingSemicolonForElseStatement(true);
                           else if (ifElseStatement!=null)
                              ifElseStatement.setUsingSemicolonForIfStatement(true);
+                         widen(ifElseStatement, null, getToken(0));
              } )*
 
         )*
@@ -5379,6 +5406,7 @@ Statements Statements() #Statements: {
 
     <EOF>
     {
+        token_source.positionTrailingComments();
         return stmts;
     }
 }
@@ -7121,9 +7149,7 @@ ExplainStatement Explain():
                 )
             )
             {
-                if (statement instanceof ASTNodeAccess) {
-                    linkASTIfMissing((ASTNodeAccess) statement, statementFirst);
-                }
+                linkStatement(statement, statementFirst);
                 es = new ExplainStatement(tk.image, statement, options);
                 es.setParenthesizedOptions(parenthesized);
             }
@@ -9382,13 +9408,15 @@ ParenthesedInsert ParenthesedInsert() #ParenthesedInsert:
 {
     ParenthesedInsert parenthesedInsert = new ParenthesedInsert();
     Insert insert;
+    Token open = getToken(1);
+    Token statementFirst;
 }
 {
-    "("
-    insert = Insert()
+    "(" { statementFirst = getToken(1); }
+    insert = Insert() { linkStatement(insert, statementFirst); }
     ")"
     {
-        return parenthesedInsert.withInsert(insert);
+        return linked(parenthesedInsert.withInsert(insert), open);
     }
 }
 
@@ -9396,13 +9424,15 @@ ParenthesedUpdate ParenthesedUpdate() #ParenthesedUpdate:
 {
     ParenthesedUpdate parenthesedUpdate = new ParenthesedUpdate();
     Update update;
+    Token open = getToken(1);
+    Token statementFirst;
 }
 {
-    "("
-    update = Update()
+    "(" { statementFirst = getToken(1); }
+    update = Update() { linkStatement(update, statementFirst); }
     ")"
     {
-        return parenthesedUpdate.withUpdate(update);
+        return linked(parenthesedUpdate.withUpdate(update), open);
     }
 }
 
@@ -9410,13 +9440,15 @@ ParenthesedDelete ParenthesedDelete() #ParenthesedDelete:
 {
     ParenthesedDelete parenthesedDelete = new ParenthesedDelete();
     Delete delete;
+    Token open = getToken(1);
+    Token statementFirst;
 }
 {
-    "("
-    delete = Delete()
+    "(" { statementFirst = getToken(1); }
+    delete = Delete() { linkStatement(delete, statementFirst); }
     ")"
     {
-        return parenthesedDelete.withDelete(delete);
+        return linked(parenthesedDelete.withDelete(delete), open);
     }
 }
 
@@ -11284,11 +11316,11 @@ RowPattern RowPatternFactor(int depth) #RowPatternFactor:
                 && (pattern instanceof RowPattern.Permute || pattern instanceof RowPattern.Exclusion)) {
             throw new ParseException("BigQuery does not support PERMUTE or row pattern exclusion");
         }
-        linkAST(pattern, first);
     }
     [ LOOKAHEAD({ !(pattern instanceof RowPattern.Anchor)
             && ("?".equals(getToken(1).image) || "*".equals(getToken(1).image)
                 || "+".equals(getToken(1).image) || getToken(1).kind == OPENING_CURLY_BRACKET) })
+        { linkAST(pattern, first); }
         pattern=RowPatternQuantifier(pattern)
     ]
     { linkAST(pattern, jjtThis); return pattern; }
@@ -12951,7 +12983,7 @@ ExpressionList ExpressionList() #ExpressionList:
                 expressionList = subList;
             }
         }
-        linkAST(expressionList, first);
+        linkASTIfMissing(expressionList, first);
         return expressionList;
     }
 }
@@ -13399,19 +13431,25 @@ Expression NavigationStep(Expression base):
     { return step; }
 }
 
-StringValue CharacterLiteral():
+StringValue CharacterLiteral(boolean link):
 {
     Token literal;
     StringValue value;
     Token first = getToken(1);
 }
 {
-    literal=<S_CHAR_LITERAL> { value = stringValue(literal); }
+    literal=<S_CHAR_LITERAL> { value = unlinkedStringValue(literal); }
     ( LOOKAHEAD({ isAdjacentStringConcat() })
         literal=<S_CHAR_LITERAL>
-        { value.setValue(value.getValue() + stringValue(literal).getValue()); }
+        { value.setValue(value.getValue() + unlinkedStringValue(literal).getValue()); }
     )*
-    { linkAST(value, first); return value; }
+    {
+        // a primary expression links the literal itself, with its own tree node
+        if (link) {
+            linkAST(value, first);
+        }
+        return value;
+    }
 }
 
 Expression PrimaryExpression() #PrimaryExpression:
@@ -13540,7 +13578,7 @@ Expression PrimaryExpression() #PrimaryExpression:
         | LOOKAHEAD({ !interrupted && (getToken(1).kind == K_TRUE || getToken(1).kind == K_FALSE) })
           (token=<K_TRUE> | token=<K_FALSE>) { retval = new BooleanValue(token.image); }
 
-        | retval=CharacterLiteral()
+        | retval=CharacterLiteral(false)
 
         | "{d" token=<S_CHAR_LITERAL> "}"  { retval = new DateValue(token.image); }
 
@@ -13588,34 +13626,33 @@ Expression PrimaryExpression() #PrimaryExpression:
                 { retval = new FunctionAllColumns(unwrapParenthesedFunction(retval)); } ]
 
             // Share field and method navigation with the other primary expressions.
-            ( LOOKAHEAD(1, ".") { linkASTIfMissing(retval, coreFirst); } nxt=NavigationStep(retval) { retval = nxt; linkASTIfMissing(retval, coreFirst); } )*
+            ( LOOKAHEAD(1, ".") { linkASTIfMissing(retval, coreFirst); } nxt=NavigationStep(retval) { retval = nxt; } )*
         )
     )
-    { linkASTIfMissing(retval, coreFirst); }
 
     [
-        LOOKAHEAD(2, { !isColumnCollateAhead() }) <K_COLLATE> (token=<S_CHAR_LITERAL> | token=<S_QUOTED_IDENTIFIER> | token=<S_IDENTIFIER>) { retval = new CollateExpression(retval, token.image); linkAST(retval, coreFirst); }
+        LOOKAHEAD(2, { !isColumnCollateAhead() }) { linkASTIfMissing(retval, coreFirst); }
+        <K_COLLATE> (token=<S_CHAR_LITERAL> | token=<S_QUOTED_IDENTIFIER> | token=<S_IDENTIFIER>) { retval = new CollateExpression(retval, token.image); }
     ]
 
     [
-        LOOKAHEAD(2, { dateExpressionAllowed } ) retval = IntervalExpressionWithoutInterval(retval) { linkASTIfMissing(retval, coreFirst); }
+        LOOKAHEAD(2, { dateExpressionAllowed } ) { linkASTIfMissing(retval, coreFirst); } retval = IntervalExpressionWithoutInterval(retval)
     ]
 
-    [ LOOKAHEAD(2) retval = ArrayExpression(retval) { linkASTIfMissing(retval, coreFirst); } ]
+    [ LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } retval = ArrayExpression(retval) ]
 
     // navigation chains, e.g. Redshift SUPER col[0].field[1].sub: field accesses
     // and subscripts may alternate freely after the primary expression
     (
-        LOOKAHEAD(2) nxt = NavigationStep(retval) { retval = nxt; linkASTIfMissing(retval, coreFirst); }
+        LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } nxt = NavigationStep(retval) { retval = nxt; }
     )*
 
-    (  LOOKAHEAD(2) "::" type=ColDataType() {
+    (  LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } "::" type=ColDataType() {
             castExpr = new CastExpression();
             castExpr.setUseCastKeyword(false);
             castExpr.setLeftExpression(retval);
             castExpr.setColDataType(type);
             retval=castExpr;
-            linkAST(retval, coreFirst);
         }
     )*
 
@@ -13623,7 +13660,7 @@ Expression PrimaryExpression() #PrimaryExpression:
     [
         LOOKAHEAD(2, { !isPostgreSqlJsonAccess(getToken(1))
                 && ((ternaryThenBranchDepth == 0 && mapKeyDepth == 0 && !isSliceColonAhead())
-                    || !":".equals(getToken(1).image)) }) (
+                    || !":".equals(getToken(1).image)) }) { linkASTIfMissing(retval, coreFirst); } (
             LOOKAHEAD(2) (
                 token="->"
                 |
@@ -13645,10 +13682,10 @@ Expression PrimaryExpression() #PrimaryExpression:
                 jsonIdents.add(new AbstractMap.SimpleEntry<Expression, String>(expression, token.image ));
             }
         )+
-        retval = JsonExpression(retval, jsonIdents) { linkASTIfMissing(retval, coreFirst); }
+        retval = JsonExpression(retval, jsonIdents)
     ]
 
-    ( LOOKAHEAD(2) <K_AT> <K_DATETIMELITERAL> <K_ZONE> timezoneRightExpr=PrimaryExpression() {
+    ( LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } <K_AT> <K_DATETIMELITERAL> <K_ZONE> timezoneRightExpr=PrimaryExpression() {
         if (timezoneExpr == null)
             timezoneExpr = new TimezoneExpression();
 
@@ -13662,17 +13699,21 @@ Expression PrimaryExpression() #PrimaryExpression:
             retval=timezoneExpr;
             // the field behind this getter is an ExpressionList
             linkElements((ExpressionList<?>) timezoneExpr.getTimezoneExpressions());
-            linkAST(retval, coreFirst);
         }
+        // each value gets a range node only once something wraps it, the outermost takes jjtThis
+        Token valueFirst = coreFirst;
         for (int i = innerSigns.size() - 1; i >= 0; i--) {
+            linkASTIfMissing(retval, valueFirst);
             retval = new SignedExpression(innerSigns.get(i).image.charAt(0), retval);
-            linkAST(retval, innerSigns.get(i));
+            valueFirst = innerSigns.get(i);
         }
         if (sign != null) {
+            linkASTIfMissing(retval, valueFirst);
             retval = new SignedExpression(sign.image.charAt(0), retval);
-            linkAST(retval, sign);
+            valueFirst = sign;
         }
         if (not) {
+            linkASTIfMissing(retval, valueFirst);
             retval = new NotExpression(retval, exclamationMarkNot);
         }
         linkAST(retval, jjtThis);
@@ -17920,6 +17961,7 @@ CreateSchema CreateSchema():
 Statement SchemaElement():
 {
     Statement element;
+    Token first = getToken(1);
 }
 {
     { schemaElementDepth++; }
@@ -17938,7 +17980,7 @@ Statement SchemaElement():
     } finally {
         schemaElementDepth--;
     }
-    { return element; }
+    { linkStatement(element, first); return element; }
 }
 
 DatabaseOption MySqlDatabaseOption():
@@ -18572,6 +18614,7 @@ CreateTable CreateTable(boolean isUsingOrReplace):
 {
     CreateTable createTable = new CreateTable();
     Token ofFirst;
+    Token executeFirst;
     Table table = null;
     List<TableElement> tableElements = new ArrayList<TableElement>();
     TableElement element;
@@ -18672,7 +18715,8 @@ CreateTable CreateTable(boolean isUsingOrReplace):
                     tk.image.toUpperCase(Locale.ROOT))); } ]
         [ <K_AS> { createTable.setUseAsKeyword(true); } ]
         (
-            LOOKAHEAD(1, <K_EXECUTE>) execute=Execute() {
+            LOOKAHEAD(1, <K_EXECUTE>) { executeFirst = getToken(1); } execute=Execute() {
+                linkStatement(execute, executeFirst);
                 requireDdlSyntax(createTable.isUseAsKeyword() && createTable.getDuplicateHandling() == null,
                         "CREATE TABLE EXECUTE requires AS and cannot use duplicate handling");
                 createTable.setExecute(execute);
@@ -19678,7 +19722,7 @@ SecurityLabel SecurityLabel():
         |
         name=RelObjectName() { statement.setObjectName(type, new Table(name, false)); }
     )
-    <K_IS> ( label=CharacterLiteral() { statement.setLabel(label); } | <K_NULL> )
+    <K_IS> ( label=CharacterLiteral(true) { statement.setLabel(label); } | <K_NULL> )
     { return statement; }
 }
 
@@ -22953,7 +22997,7 @@ Comment Comment():
     )
     <K_IS>
     (
-        comment=CharacterLiteral() { result.setComment(comment); }
+        comment=CharacterLiteral(true) { result.setComment(comment); }
         | <K_NULL>
     )
     {
@@ -23514,14 +23558,15 @@ Revoke Revoke(boolean defaults):
 }
 
 AlterDefaultPrivileges AlterDefaultPrivileges():
-{ AlterDefaultPrivileges result = new AlterDefaultPrivileges(); Token token; List<String> names; Grant grant; Revoke revoke; }
+{ AlterDefaultPrivileges result = new AlterDefaultPrivileges(); Token token; List<String> names; Grant grant; Revoke revoke; Token statementFirst; }
 {
     <K_DEFAULT> AccessKeyword("PRIVILEGES")
     [ <K_FOR> ( token=<S_IDENTIFIER> | token=<K_USER> ) { result.setRoleKeyword(accessEnum(AlterDefaultPrivileges.RoleKeyword.class, token.image)); }
       names=AccessNames() { result.setRoles(names); } ]
     [ <K_IN> <K_SCHEMA> names=AccessNames() { result.setSchemas(names); } ]
-    ( grant=AccessGrant(true) { result.setGrant(grant); }
-      | revoke=Revoke(true) { result.setRevoke(revoke); } )
+    { statementFirst = getToken(1); }
+    ( grant=AccessGrant(true) { linkStatement(grant, statementFirst); result.setGrant(grant); }
+      | revoke=Revoke(true) { linkStatement(revoke, statementFirst); result.setRevoke(revoke); } )
     { return result; }
 }
 
diff --git a/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
index 1f5f1758ca..83e706ac36 100644
--- a/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
+++ b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
@@ -43,6 +43,7 @@
 import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.Statements;
 import net.sf.jsqlparser.statement.create.sequence.CreateSequence;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import org.junit.jupiter.api.Test;
@@ -64,14 +65,20 @@ public void testEveryParsedNodeMapsBackToItsSource() throws IOException {
             String sql = Files.readString(file);
             Object statements;
             try {
-                // a statement the parser rejects leaves the rest of its file to check
-                statements =
-                        CCJSqlParserUtil.parseStatements(sql, parser -> parser.withErrorRecovery());
+                // a statement the parser rejects leaves the rest of its file to check, and the
+                // Oracle tests parse in the dialect they are written in
+                boolean oracle = file.toString().contains("oracle-tests");
+                statements = CCJSqlParserUtil.parseStatements(sql, parser -> {
+                    parser.withErrorRecovery();
+                    if (oracle) {
+                        parser.withDialect(AbstractJSqlParser.Dialect.ORACLE);
+                    }
+                });
             } catch (JSQLParserException e) {
                 // the corpus also holds SQL the parser rejects
                 continue;
             }
-            new Walk(file, sql, problems).check(statements);
+            new Walk(file.toString(), sql, problems).check(statements);
         }
         assertThat(problems).isEmpty();
     }
@@ -84,13 +91,6 @@ public void testRangesOfStatementsClausesAndTypes() throws JSQLParserException {
         sql = "UPDATE t SET a = 1 WHERE b = 2";
         assertSpans(sql, sql, (ASTNodeAccess) statement(sql));
 
-        sql = "BEGIN SELECT 1; END;";
-        assertSpans(sql, sql, (ASTNodeAccess) statement(sql));
-
-        sql = "FOO BAR BAZ";
-        assertSpans(sql, sql, (ASTNodeAccess) CCJSqlParserUtil.parse(sql,
-                parser -> parser.withUnsupportedStatements(true)));
-
         sql = "SELECT /*+ INDEX(t i) */ a FROM t";
         assertSpans("/*+ INDEX(t i) */", sql, ((PlainSelect) statement(sql)).getOracleHint());
 
@@ -126,6 +126,39 @@ public void testRangesOfStatementsClausesAndTypes() throws JSQLParserException {
         assertSpans("'a'\n'b'", sql, item((PlainSelect) merged, 0));
     }
 
+    @Test
+    public void testStatementsTheCorpusLacks() throws JSQLParserException {
+        Map<String, String> problems = new TreeMap<>();
+        for (String sql : new String[] {
+                "WITH x AS (INSERT INTO t VALUES (1) RETURNING *) SELECT * FROM x",
+                "WITH x AS (UPDATE t SET a = 1 RETURNING *) SELECT * FROM x",
+                "WITH x AS (DELETE FROM t RETURNING *) SELECT * FROM x",
+                "CREATE SCHEMA s CREATE TABLE t (a INT) CREATE VIEW v AS SELECT 1",
+                "CREATE TABLE t AS EXECUTE p",
+                "ALTER DEFAULT PRIVILEGES GRANT SELECT ON TABLES TO r",
+                "IF a = 1 SELECT 1;",
+                "BEGIN SELECT 1; END;"}) {
+            new Walk(sql, sql, problems).check(CCJSqlParserUtil.parseStatements(sql));
+        }
+        String block = "BEGIN x := 1; NULL; foo(1); END;";
+        new Walk(block, block, problems).check(CCJSqlParserUtil.parseStatements(block,
+                parser -> parser.withDialect(AbstractJSqlParser.Dialect.ORACLE)));
+        String opaque = "FOO BAR BAZ";
+        new Walk(opaque, opaque, problems).check(CCJSqlParserUtil.parseStatements(opaque,
+                parser -> parser.withUnsupportedStatements(true)));
+        assertThat(problems).isEmpty();
+    }
+
+    @Test
+    public void testCommentBeforeEndOfInputHasPosition() throws ParseException {
+        String sql = "SELECT a FROM t -- trailing";
+        Statements statements = CCJSqlParserUtil.newParser(sql).Statements();
+        Token endOfInput = ((ASTNodeAccess) statements.get(0)).getASTNode().jjtGetLastToken().next;
+        Token comment = endOfInput.specialToken;
+        assertEquals("-- trailing",
+                sql.substring(comment.absoluteBegin - 1, comment.absoluteEnd - 1));
+    }
+
     private static Statement statement(String sql) throws JSQLParserException {
         return CCJSqlParserUtil.parse(sql);
     }
@@ -148,14 +181,14 @@ private static List<Path> sqlFiles() throws IOException {
     }
 
     private static final class Walk {
-        private final Path file;
+        private final String source;
         private final String sql;
         private final Map<String, String> problems;
         private final Set<Object> visited = Collections.newSetFromMap(new IdentityHashMap<>());
         private final List<Object[]> ranges = new ArrayList<>();
 
-        Walk(Path file, String sql, Map<String, String> problems) {
-            this.file = file;
+        Walk(String source, String sql, Map<String, String> problems) {
+            this.source = source;
             this.sql = sql;
             this.problems = problems;
         }
@@ -238,6 +271,14 @@ private void checkRange(Object value, int[] range, int[] enclosing) {
             if (enclosing != null && (range[0] < enclosing[0] || range[1] > enclosing[1])) {
                 report("lies outside the object that holds it", value);
             }
+            ASTNodeAccess parent = value instanceof ASTNodeAccessImpl
+                    ? ((ASTNodeAccessImpl) value).getParent()
+                    : null;
+            Node parentNode = parent == null ? null : parent.getASTNode();
+            if (parentNode != null && (parentNode.jjtGetFirstToken().absoluteBegin - 1 > range[0]
+                    || parentNode.jjtGetLastToken().absoluteEnd - 1 < range[1])) {
+                report("lies outside its parent " + parent.getClass().getSimpleName(), value);
+            }
             ranges.add(new Object[] {range, value});
             String text = sql.substring(range[0], range[1]);
             // PRIOR is an operator only inside CONNECT BY
@@ -287,7 +328,7 @@ private void report(String problem, Object value) {
 
         private void report(String problem, Object value, Object detail) {
             problems.putIfAbsent(value.getClass().getSimpleName() + " " + problem,
-                    file + ": " + detail);
+                    source + ": " + detail);
         }
     }
 

From e8de6e94296630bf97cbb3e9fcb57bfbb3a1152b Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@gmail.com>
Date: Thu, 29 Oct 2026 06:45:49 +0100
Subject: [PATCH 5/7] test: split the coverage walk to settle Codacy's PMD
 findings

`visit` and `checkRange` exceeded PMD's NPath threshold of 200, so the
container walk and the parent check move into methods of their own.
`isHeld` compares with `==` on purpose: a getter that answers a new
object on every call computes its child rather than holding it.
---
 .../parser/ASTNodeCoverageTest.java           | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
index 83e706ac36..6ce2622099 100644
--- a/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
+++ b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
@@ -207,27 +207,31 @@ private void visit(Object value, int[] enclosing) {
                 checkRange(value, range, enclosing);
             }
             int[] inner = range != null ? range : enclosing;
+            visitElements(value, inner);
+            if (isModel(value)) {
+                for (Method getter : value.getClass().getMethods()) {
+                    if (isChildGetter(getter)) {
+                        visitChild(value, getter, inner);
+                    }
+                }
+            }
+        }
+
+        private void visitElements(Object value, int[] enclosing) {
             if (value instanceof Collection) {
                 for (Object element : (Collection<?>) value) {
-                    visit(element, inner);
+                    visit(element, enclosing);
                 }
             } else if (value instanceof Map) {
                 for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
-                    visit(entry.getKey(), inner);
-                    visit(entry.getValue(), inner);
+                    visit(entry.getKey(), enclosing);
+                    visit(entry.getValue(), enclosing);
                 }
             } else if (value instanceof Map.Entry) {
-                visit(((Map.Entry<?, ?>) value).getKey(), inner);
-                visit(((Map.Entry<?, ?>) value).getValue(), inner);
+                visit(((Map.Entry<?, ?>) value).getKey(), enclosing);
+                visit(((Map.Entry<?, ?>) value).getValue(), enclosing);
             } else if (value instanceof Optional) {
-                ((Optional<?>) value).ifPresent(present -> visit(present, inner));
-            }
-            if (isModel(value)) {
-                for (Method getter : value.getClass().getMethods()) {
-                    if (isChildGetter(getter)) {
-                        visitChild(value, getter, inner);
-                    }
-                }
+                ((Optional<?>) value).ifPresent(present -> visit(present, enclosing));
             }
         }
 
@@ -271,14 +275,7 @@ private void checkRange(Object value, int[] range, int[] enclosing) {
             if (enclosing != null && (range[0] < enclosing[0] || range[1] > enclosing[1])) {
                 report("lies outside the object that holds it", value);
             }
-            ASTNodeAccess parent = value instanceof ASTNodeAccessImpl
-                    ? ((ASTNodeAccessImpl) value).getParent()
-                    : null;
-            Node parentNode = parent == null ? null : parent.getASTNode();
-            if (parentNode != null && (parentNode.jjtGetFirstToken().absoluteBegin - 1 > range[0]
-                    || parentNode.jjtGetLastToken().absoluteEnd - 1 < range[1])) {
-                report("lies outside its parent " + parent.getClass().getSimpleName(), value);
-            }
+            checkInsideParent(value, range);
             ranges.add(new Object[] {range, value});
             String text = sql.substring(range[0], range[1]);
             // PRIOR is an operator only inside CONNECT BY
@@ -290,6 +287,17 @@ private void checkRange(Object value, int[] range, int[] enclosing) {
             }
         }
 
+        private void checkInsideParent(Object value, int[] range) {
+            ASTNodeAccess parent = value instanceof ASTNodeAccessImpl
+                    ? ((ASTNodeAccessImpl) value).getParent()
+                    : null;
+            Node parentNode = parent == null ? null : parent.getASTNode();
+            if (parentNode != null && (parentNode.jjtGetFirstToken().absoluteBegin - 1 > range[0]
+                    || parentNode.jjtGetLastToken().absoluteEnd - 1 < range[1])) {
+                report("lies outside its parent " + parent.getClass().getSimpleName(), value);
+            }
+        }
+
         private void checkReparses(Object value, String text, Parse parse) {
             Object again;
             try {
@@ -341,6 +349,7 @@ private static String normalized(String text) {
     }
 
     // a getter that builds new objects on each call computes them rather than holding them
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
     private static boolean isHeld(Object child, Object again) {
         if (child instanceof ASTNodeAccess) {
             return child == again;

From 0c8073f3bc36df10f8bfa7b84c03599a41e880fb Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@gmail.com>
Date: Thu, 29 Oct 2026 07:09:39 +0100
Subject: [PATCH 6/7] perf: create the deque of NOT tokens only for a NOT
 condition

`Condition()` created a deque for the tokens of a leading `NOT` on every
call, though few conditions have one. Each empty `ArrayDeque` allocates
its 16-slot array up front, so parsing `performance.sql` allocated
585 KB more per parse. The deque is now created at the first `NOT`.
---
 .../jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index b2bf434461..8b88f73e15 100644
--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -12394,7 +12394,7 @@ Expression Condition():
     Expression left;
     // Leading NOT / ! prefixes, leftmost token wraps outermost (issue #1170).
     final Deque<Boolean> exclamationMarks = new ArrayDeque<Boolean>();
-    final Deque<Token> notTokens = new ArrayDeque<Token>();
+    Deque<Token> notTokens = null;
     int oraclePrior = EqualsTo.NO_ORACLE_PRIOR;
     int oracleJoin = EqualsTo.NO_ORACLE_JOIN;
     Token prior = null;
@@ -12403,7 +12403,12 @@ Expression Condition():
     (
         LOOKAHEAD({ getToken(1).kind == K_NOT || "!".equals(getToken(1).image) })
         ( <K_NOT> { exclamationMarks.addFirst(Boolean.FALSE); } | "!" { exclamationMarks.addFirst(Boolean.TRUE); } )
-        { notTokens.addFirst(getToken(0)); }
+        {
+            if (notTokens == null) {
+                notTokens = new ArrayDeque<Token>();
+            }
+            notTokens.addFirst(getToken(0));
+        }
     )*
     (
         LOOKAHEAD(<K_EXISTS> JdbcNamedParameter() ":", {

From 3e8a5030026a51e2a6545b9dde1a0f1f05d61aa5 Mon Sep 17 00:00:00 2001
From: Knut Wannheden <knut.wannheden@gmail.com>
Date: Thu, 29 Oct 2026 08:32:10 +0100
Subject: [PATCH 7/7] refactor: keep RangeNode internal to the parser package

Only the generated parser creates a `RangeNode`, and callers see it as
the `Node` that `getASTNode()` returns. Keeping the class package-private
leaves its design free to change before a release.
---
 src/main/java/net/sf/jsqlparser/parser/RangeNode.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/sf/jsqlparser/parser/RangeNode.java b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
index 25df9e546d..9b025a2ebc 100644
--- a/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
+++ b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
@@ -14,10 +14,10 @@
  * grammar rule opens a tree node for, or one whose text runs past its tree node. In that second
  * case it stands in for the tree node, answering its parent, children and id, with the wider range.
  */
-public final class RangeNode extends Node {
+final class RangeNode extends Node {
     private final Node treeNode;
 
-    public RangeNode(Token first, Token last, Node treeNode) {
+    RangeNode(Token first, Token last, Node treeNode) {
         super(CCJSqlParserTreeConstants.JJTEXPRESSION);
         this.treeNode = treeNode;
         jjtSetFirstToken(first);