Skip to content

Improved unique table name detection #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2016
Merged

Improved unique table name detection #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42227c6
SqlBuilder::addAlias: Fixed tests
norbe Apr 4, 2016
b389723
SqlBuilder: Improved checking of unique table name
norbe Apr 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Database/Table/SqlBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
15 changes: 9 additions & 6 deletions tests/Database/Table/SqlBuilder.addAlias().phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ $driver = $connection->getSupplementalDriver();


test(function() use ($context, $driver) { // test duplicated table names throw exception
if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
$sqlBuilder = new SqlBuilderMock('public.author', $context);
} else {
$sqlBuilder = new SqlBuilderMock('author', $context);
}
$authorTable = ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA) ? 'public.' : '' ) . 'author';
$sqlBuilder = new SqlBuilderMock($authorTable, $context);
$sqlBuilder->addAlias(':book(translator)', 'book1');
$sqlBuilder->addAlias(':book:book_tag', 'book2');
Assert::exception(function() use ($sqlBuilder) {
Expand All @@ -42,7 +39,7 @@ test(function() use ($context, $driver) { // test duplicated table names throw e

Assert::exception(function() use ($sqlBuilder) { // reserved by base table name
$sqlBuilder->addAlias(':book', 'author');
}, Nette\InvalidArgumentException::class, "Table alias 'author' from chain ':book' is already in use by chain 'author'. Please add/change alias for one of them.");
}, Nette\InvalidArgumentException::class, "Table alias 'author' from chain ':book' is already in use by chain '$authorTable'. Please add/change alias for one of them.");

Assert::exception(function() use ($sqlBuilder) {
$sqlBuilder->addAlias(':book', 'book1');
Expand All @@ -54,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.");
});


Expand Down