Skip to content

Fix #1959 do not join same association twice #1961

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
soyuka merged 1 commit into from
May 24, 2018
Merged

Fix #1959 do not join same association twice #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions features/main/circular_reference.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,29 @@ Feature: Circular references handling
"@type": "CircularReference",
"parent": "/circular_references/1",
"children": [
"/circular_references/1",
"/circular_references/2"
"/circular_references/1"
]
},
"children": []
}
"""
And I send a "GET" request to "/circular_references/1"
Then the response status code should be 200
And the JSON should be equal to:
"""
{
"@context": "/contexts/CircularReference",
"@id": "/circular_references/1",
"@type": "CircularReference",
"parent": "/circular_references/1",
"children": [
"/circular_references/1",
{
"@id": "/circular_references/2",
"@type": "CircularReference",
"parent": "/circular_references/1",
"children": []
}
]
}
"""
8 changes: 6 additions & 2 deletions src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,13 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
$queryBuilder->addSelect($associationAlias);
}

// Avoid recursion
// Avoid recursive joins
if ($mapping['targetEntity'] === $resourceClass) {
$queryBuilder->addSelect($associationAlias);
// Avoid joining the same association twice (see #1959)
if (!\in_array($associationAlias, $queryBuilder->getAllAliases(), true)) {
$queryBuilder->addSelect($associationAlias);
}

continue;
}

Expand Down