SqlBuilder: Improved checking of unique table name

Author: norbe

src/Database/Table/SqlBuilder.php

@@ -551,7 +551,7 @@ public function parseJoinsCb(& $joins, $match)
 				$tableAlias = preg_replace('#^(.*\.)?(.*)$#', '$2', $table);
 			}
 
-			$tableChain .= $keyMatch['del'] . $tableAlias;
+			$tableChain .= $keyMatch[0];
 			if (!$isLast || !$this->currentAlias) {
 				$this->checkUniqueTableName($tableAlias, $tableChain);
 			}

tests/Database/Table/SqlBuilder.addAlias().phpt

@@ -51,6 +51,12 @@ test(function() use ($context, $driver) { // test duplicated table names throw e
 		$joins = [];
 		$sqlBuilder->parseJoins($joins, $query);
 	}, Nette\InvalidArgumentException::class, "Table alias 'tag' from chain '.book1:book_tag.tag' is already in use by chain ':book'. Please add/change alias for one of them.");
+
+	Assert::exception(function() use ($sqlBuilder) {
+		$query = 'WHERE :book(translator).id IS NULL AND :book.id IS NULL';
+		$joins = [];
+		$sqlBuilder->parseJoins($joins, $query);
+	}, Nette\InvalidArgumentException::class, "Table alias 'book' from chain ':book' is already in use by chain ':book(translator)'. Please add/change alias for one of them.");
 });