parse table/column names including DB name

Author: schlndh

src/Analyser/AnalyserState.php

@@ -393,7 +393,7 @@ private function analyseSingleSelectQuery(SimpleSelectQuery $select): array
 					break;
 				case SelectExprTypeEnum::ALL_COLUMNS:
 					assert($selectExpr instanceof AllColumns);
-					$allFields = $this->columnResolver->resolveAllColumns($selectExpr->tableName);
+					$allFields = $this->columnResolver->resolveAllColumns($selectExpr->tableName?->name);
 
 					foreach ($allFields as $field) {
 						$this->columnResolver->registerField($field, true);
@@ -464,16 +464,17 @@ private function analyseTableReference(TableReference $fromClause, ColumnResolve
 				$columnResolver = clone $columnResolver;
 
 				try {
-					$tableType = $columnResolver->registerTable($fromClause->name, $fromClause->alias);
+					$tableType = $columnResolver->registerTable($fromClause->name->name, $fromClause->alias);
 
 					if ($tableType === ColumnInfoTableTypeEnum::TABLE) {
-						$this->referencedTables[$fromClause->name] ??= new ReferencedSymbol\Table($fromClause->name);
+						$this->referencedTables[$fromClause->name->name]
+							??= new ReferencedSymbol\Table($fromClause->name->name);
 					}
 				} catch (AnalyserException | DbReflectionException $e) {
 					$this->errors[] = $e->toAnalyserError();
 				}
 
-				return [[$fromClause->alias ?? $fromClause->name], $columnResolver];
+				return [[$fromClause->alias ?? $fromClause->name->name], $columnResolver];
 			case TableReferenceTypeEnum::SUBQUERY:
 				assert($fromClause instanceof Subquery);
 				$columnResolver = clone $columnResolver;
@@ -548,7 +549,7 @@ private function analyseDeleteQuery(DeleteQuery $query): array
 
 			// don't report missing tables to delete if the table reference is not parsed successfully
 			foreach ($query->tablesToDelete as $table) {
-				if ($this->columnResolver->hasTableForDelete($table)) {
+				if ($this->columnResolver->hasTableForDelete($table->name)) {
 					continue;
 				}
 
@@ -557,12 +558,12 @@ private function analyseDeleteQuery(DeleteQuery $query): array
 					$query->table instanceof Table
 					&& $query->table->alias === null
 					&& count($query->tablesToDelete) === 1
-					&& $query->table->name === $table
+					&& $query->table->name->name === $table->name
 				) {
 					continue;
 				}
 
-				$this->errors[] = AnalyserErrorBuilder::createTableDoesntExistError($table);
+				$this->errors[] = AnalyserErrorBuilder::createTableDoesntExistError($table->name);
 			}
 		} catch (AnalyserException | DbReflectionException $e) {
 			$this->errors[] = $e->toAnalyserError();
@@ -631,7 +632,7 @@ private function analyseInsertOrReplaceQuery(InsertQuery|ReplaceQuery $query): a
 			$this->errors[] = $e->toAnalyserError();
 		}
 
-		$tableSchema = $this->columnResolver->findTableSchema($query->tableName);
+		$tableSchema = $this->columnResolver->findTableSchema($query->tableName->name);
 		$setColumnNames = [];
 		$onDuplicateKeyAnalyser = $this;
 
@@ -759,7 +760,7 @@ private function analyseInsertOrReplaceQuery(InsertQuery|ReplaceQuery $query): a
 	private function analyseTruncateQuery(TruncateQuery $query): void
 	{
 		try {
-			$this->dbReflection->findTableSchema($query->tableName);
+			$this->dbReflection->findTableSchema($query->tableName->name);
 		} catch (DbReflectionException $e) {
 			$this->errors[] = $e->toAnalyserError();
 		}
@@ -781,7 +782,7 @@ private function resolveExprType(
 				try {
 					$resolvedColumn = $this->columnResolver->resolveColumn(
 						$expr->name,
-						$expr->tableName,
+						$expr->tableName?->name,
 						$this->fieldBehavior,
 						$condition,
 					);

src/Ast/Expr/Column.php

@@ -5,6 +5,7 @@
 namespace MariaStan\Ast\Expr;
 
 use MariaStan\Ast\BaseNode;
+use MariaStan\Ast\Query\TableReference\TableName;
 use MariaStan\Parser\Position;
 
 final class Column extends BaseNode implements Expr
@@ -13,7 +14,7 @@ public function __construct(
 		Position $startPosition,
 		Position $endPosition,
 		public readonly string $name,
-		public readonly ?string $tableName = null,
+		public readonly ?TableName $tableName = null,
 	) {
 		parent::__construct($startPosition, $endPosition);
 	}

src/Ast/Query/DeleteQuery.php

@@ -8,14 +8,15 @@
 use MariaStan\Ast\Exception\InvalidAstException;
 use MariaStan\Ast\Expr\Expr;
 use MariaStan\Ast\OrderBy;
+use MariaStan\Ast\Query\TableReference\TableName;
 use MariaStan\Ast\Query\TableReference\TableReference;
 use MariaStan\Parser\Position;
 
 use function count;
 
 final class DeleteQuery extends BaseNode implements Query
 {
-	/** @param non-empty-array<string> $tablesToDelete */
+	/** @param non-empty-array<TableName> $tablesToDelete */
 	public function __construct(
 		Position $startPosition,
 		Position $endPosition,

src/Ast/Query/InsertQuery.php

@@ -7,6 +7,7 @@
 use MariaStan\Ast\BaseNode;
 use MariaStan\Ast\Expr\Assignment;
 use MariaStan\Ast\Query\InsertBody\InsertBody;
+use MariaStan\Ast\Query\TableReference\TableName;
 use MariaStan\Parser\Position;
 
 final class InsertQuery extends BaseNode implements Query
@@ -15,7 +16,7 @@ final class InsertQuery extends BaseNode implements Query
 	public function __construct(
 		Position $startPosition,
 		Position $endPosition,
-		public readonly string $tableName,
+		public readonly TableName $tableName,
 		public readonly InsertBody $insertBody,
 		public readonly ?array $onDuplicateKeyUpdate = null,
 		public readonly bool $ignoreErrors = false,

src/Ast/Query/ReplaceQuery.php

@@ -6,14 +6,15 @@
 
 use MariaStan\Ast\BaseNode;
 use MariaStan\Ast\Query\InsertBody\InsertBody;
+use MariaStan\Ast\Query\TableReference\TableName;
 use MariaStan\Parser\Position;
 
 final class ReplaceQuery extends BaseNode implements Query
 {
 	public function __construct(
 		Position $startPosition,
 		Position $endPosition,
-		public readonly string $tableName,
+		public readonly TableName $tableName,
 		public readonly InsertBody $insertBody,
 	) {
 		parent::__construct($startPosition, $endPosition);

src/Ast/Query/TableReference/Table.php

@@ -13,7 +13,7 @@ final class Table extends BaseNode implements TableReference
 	public function __construct(
 		Position $startPosition,
 		Position $endPosition,
-		public readonly string $name,
+		public readonly TableName $name,
 		public readonly ?string $alias = null,
 		public readonly array $indexHints = [],
 	) {

src/Ast/Query/TableReference/TableName.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MariaStan\Ast\Query\TableReference;
+
+use MariaStan\Ast\BaseNode;
+use MariaStan\Parser\Position;
+
+final class TableName extends BaseNode
+{
+	public function __construct(
+		Position $startPosition,
+		Position $endPosition,
+		public readonly string $name,
+		// TODO: consider datbaseName during analysis
+		public readonly ?string $databaseName = null,
+	) {
+		parent::__construct($startPosition, $endPosition);
+	}
+}

src/Ast/Query/TruncateQuery.php

@@ -7,14 +7,15 @@
 use MariaStan\Ast\BaseNode;
 use MariaStan\Ast\Lock\NoWait;
 use MariaStan\Ast\Lock\Wait;
+use MariaStan\Ast\Query\TableReference\TableName;
 use MariaStan\Parser\Position;
 
 final class TruncateQuery extends BaseNode implements Query
 {
 	public function __construct(
 		Position $startPosition,
 		Position $endPosition,
-		public readonly string $tableName,
+		public readonly TableName $tableName,
 		public readonly Wait|NoWait|null $wait = null,
 	) {
 		parent::__construct($startPosition, $endPosition);

src/Ast/SelectExpr/AllColumns.php

@@ -5,14 +5,15 @@
 namespace MariaStan\Ast\SelectExpr;
 
 use MariaStan\Ast\BaseNode;
+use MariaStan\Ast\Query\TableReference\TableName;
 use MariaStan\Parser\Position;
 
 final class AllColumns extends BaseNode implements SelectExpr
 {
 	public function __construct(
 		Position $startPosition,
 		Position $endPosition,
-		public readonly ?string $tableName = null,
+		public readonly ?TableName $tableName = null,
 	) {
 		parent::__construct($startPosition, $endPosition);
 	}

src/PHPStan/Helper/PHPStanReturnTypeHelper.php

@@ -385,7 +385,7 @@ private function findColumnTypeOverride(?ColumnInfo $column): ?Type
 					);
 				}
 
-				$conflictingType = $this->columnTypeOverrides[$expr->tableName][$expr->name] ?? null;
+				$conflictingType = $this->columnTypeOverrides[$expr->tableName->name][$expr->name] ?? null;
 
 				if ($conflictingType !== null) {
 					throw new InvalidArgumentException(
@@ -396,7 +396,7 @@ private function findColumnTypeOverride(?ColumnInfo $column): ?Type
 
 				// I add null, so that it can be intersected with nullable columns
 				// (e.g. WHERE col IS NULL, LEFT JOIN, ...)
-				$this->columnTypeOverrides[$expr->tableName][$expr->name] = TypeCombinator::addNull($type);
+				$this->columnTypeOverrides[$expr->tableName->name][$expr->name] = TypeCombinator::addNull($type);
 			}
 		}