Expose tokens for TableReference

Author: simolus3

sqlparser/CHANGELOG.md

@@ -4,7 +4,7 @@
   taking an `ParserEntrypoint` enum.
 - In drift files, allow reading imports and statement metadata from comments.
 - Make `Queryable` and `TableOrSubquery` sealed classes, remove `Queryable.when`.
-- Expose tokens making up a `Reference`.
+- Expose tokens making up `Reference`s and `TableReference`s.
 
 ## 0.43.1
 

sqlparser/lib/src/ast/common/queryables.dart

@@ -23,6 +23,7 @@ class TableReference extends TableOrSubquery
     with ReferenceOwner
     implements Renamable, ResolvesToResultSet, InExpressionTarget {
   final String? schemaName;
+  Token? schemaNameToken;
   final String tableName;
   Token? tableNameToken;
 

sqlparser/lib/src/reader/parser.dart

@@ -1963,10 +1963,7 @@ extension Parser on ParserState {
     }
 
     _consume(TokenType.on, 'Expected ON');
-    _suggestHint(const TableNameDescription());
-    final nameToken = _consumeIdentifier('Expected a table name');
-    final tableRef = TableReference(nameToken.identifier)
-      ..setSpan(nameToken, nameToken);
+    final tableRef = _tableReference(allowAlias: false);
 
     if (_matchOne(TokenType.$for)) {
       const msg = 'Expected FOR EACH ROW';
@@ -2062,11 +2059,7 @@ extension Parser on ParserState {
     final name = _consumeIdentifier('Expected a name for this index');
 
     _consume(TokenType.on, 'Expected ON table');
-    _suggestHint(const TableNameDescription());
-    final nameToken = _consumeIdentifier('Expected a table name');
-    final tableRef = TableReference(nameToken.identifier)
-      ..setSpan(nameToken, nameToken);
-
+    final tableRef = _tableReference(allowAlias: false);
     _consume(TokenType.leftParen, 'Expected indexed columns in parentheses');
 
     final indexes = _indexedColumns();
@@ -2589,26 +2582,27 @@ extension Parser on ParserState {
   TableReference _tableReference({bool allowAlias = true}) {
     _suggestHint(const TableNameDescription());
 
-    final first = _consumeIdentifier('Expected table or schema name here');
-    IdentifierToken? second;
+    var tableName = _consumeIdentifier('Expected table or schema name here');
+
+    IdentifierToken? schemaName;
     IdentifierToken? as;
     if (_matchOne(TokenType.dot)) {
-      second = _consumeIdentifier('Expected a table name here');
+      schemaName = tableName;
+      tableName = _consumeIdentifier('Expected a table name here');
     }
 
     if (allowAlias) {
       as = _as();
     }
 
-    final tableNameToken = second ?? first;
-
     return TableReference(
-      tableNameToken.identifier,
+      tableName.identifier,
       as: as?.identifier,
-      schemaName: second == null ? null : first.identifier,
+      schemaName: schemaName?.identifier,
     )
-      ..setSpan(first, _previous)
-      ..tableNameToken = tableNameToken;
+      ..setSpan(schemaName ?? tableName, _previous)
+      ..schemaNameToken = schemaName
+      ..tableNameToken = tableName;
   }
 
   ForeignKeyClause _foreignKeyClause() {

sqlparser/test/parser/utils.dart

@@ -97,6 +97,11 @@ void enforceHasSpan(AstNode node) {
       checkHasToken(node.entityName, node.entityNameToken, 'entityName');
       checkHasToken(node.columnName, node.columnNameToken, 'columnName');
     }
+
+    if (node is TableReference) {
+      checkHasToken(node.schemaName, node.schemaNameToken, 'schemaName');
+      checkHasToken(node.tableName, node.tableNameToken, 'tableName');
+    }
   }
 
   final problematic = [node]