Skip to content
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

Avoid joining relations twice #30

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Avoid joining relations twice #30

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
db8d777
`Resolver`: Cache $target aliases of the current query
yhabteab Nov 3, 2021
4d1b32a
`Query`: Avoid joining the same relation twice
yhabteab Nov 3, 2021
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
14 changes: 12 additions & 2 deletions src/Query.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@ public function assembleSelect()
)
);

// Needs to be reset before we can begin to resolve the actual model relations.
$resolver->resetKnownRelations();

foreach ($this->getWith() as $relation) {
$select->columns(
$resolver->qualifyColumnsAndAliases(
Expand Down Expand Up @@ -447,7 +450,8 @@ public function assembleSelect()
$joinedRelations = [];
foreach ($this->getWith() + $this->getUtilize() as $path => $_) {
foreach ($resolver->resolveRelations($path) as $relationPath => $relation) {
if (isset($joinedRelations[$relationPath])) {
$tableName = $relation->getTarget()->getTableName();
if (isset($joinedRelations[$tableName])) {
continue;
}

Expand All @@ -458,6 +462,12 @@ public function assembleSelect()
$sourceAlias = $resolver->getAlias($source);
$targetAlias = $resolver->getAlias($target);

if (isset($joinedRelations[$source->getTableName()])) {
// When this relation is already joined, we only need to use
// it's alias instead of generating a new one
$sourceAlias = $joinedRelations[$source->getTableName()];
}

$conditions = [];
foreach ($relatedKeys as $fk => $ck) {
$conditions[] = sprintf(
Expand All @@ -484,7 +494,7 @@ public function assembleSelect()
}
}

$joinedRelations[$relationPath] = true;
$joinedRelations[$tableName] = $resolver->getAlias($relation->getTarget());
}
}

Expand Down
36 changes: 35 additions & 1 deletion src/Resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ class Resolver
/** @var SplObjectStorage Resolved relations */
protected $resolvedRelations;

/** @var array Known and already resolved/joined relations */
protected $knownRelations;

/**
* Create a new resolver
*/
Expand Down Expand Up @@ -92,6 +95,20 @@ public function getRelations(Model $model)
return $this->relations[$model];
}

/**
* Reset this model's known relations
*
* Should always be called before resolving this query's with[] relations
*
* @return $this
*/
public function resetKnownRelations()
{
$this->knownRelations = [];

return $this;
}

/**
* Get a model's behaviors
*
Expand Down Expand Up @@ -339,13 +356,22 @@ public function qualifyColumnsAndAliases($columns, Model $model = null, $autoAli
);
}

$knownTargetAlias = null;
if (isset($this->knownRelations[$target->getTableName()])) {
$knownTargetAlias = $this->knownRelations[$target->getTableName()];
}

$qualified = [];
foreach ($columns as $alias => $column) {
if (is_int($alias) && is_array($column)) {
// $columns is $this->requireAndResolveColumns()
list($target, $alias, $columnName) = $column;
$targetAlias = $this->getAlias($target);

if (isset($this->knownRelations[$target->getTableName()])) {
$knownTargetAlias = $this->knownRelations[$target->getTableName()];
}

// Thanks to PHP 5.6 where `list` is evaluated from right to left. It will extract
// the values for `$target` and `$alias` then from the third argument (`$column`).
$column = $columnName;
Expand Down Expand Up @@ -375,12 +401,20 @@ public function qualifyColumnsAndAliases($columns, Model $model = null, $autoAli
$column = clone $column; // The expression may be part of a model and those shouldn't change implicitly
$column->setColumns($this->qualifyColumns($column->getColumns(), $target));
} else {
$column = $this->qualifyColumn($column, $targetAlias);
if (! $knownTargetAlias) {
$knownTargetAlias = $targetAlias;
}

$column = $this->qualifyColumn($column, $knownTargetAlias);
}

$qualified[$alias] = $column;
}

if (! isset($this->knownRelations[$target->getTableName()])) {
$this->knownRelations[$target->getTableName()] = $targetAlias;
}

return $qualified;
}

Expand Down