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

Jump to bottom

IBX-7172: Fixed Repository Filtering by multiple ObjectStateId criteria #401

Merged
merged 9 commits into from
Feb 19, 2024
Merged

IBX-7172: Fixed Repository Filtering by multiple ObjectStateId criteria #401

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
85c58f3
IBX-7172: loadLocationChildren() not working with multiple objectstat…
vidarl Jan 9, 2024
3271b67
fixup! IBX-7172: loadLocationChildren() not working with multiple obj…
vidarl Jan 12, 2024
03b685d
Update eZ/Publish/Core/Persistence/Legacy/Filter/CriterionQueryBuilde…
vidarl Jan 15, 2024
9df0868
fixup! IBX-7172: loadLocationChildren() not working with multiple obj…
vidarl Jan 16, 2024
57fcf5b
fixup! IBX-7172: loadLocationChildren() not working with multiple obj…
vidarl Jan 16, 2024
b3cf696
Update eZ/Publish/API/Repository/Tests/Filtering/ContentFilteringTest…
vidarl Feb 13, 2024
b83916c
Apply suggestions from code review
vidarl Feb 13, 2024
c205b0b
fixup! fixup! IBX-7172: loadLocationChildren() not working with multi…
vidarl Feb 13, 2024
c0dfbad
fixup! fixup! fixup! IBX-7172: loadLocationChildren() not working wit…
vidarl Feb 14, 2024
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
10 changes: 7 additions & 3 deletions ...ore/Persistence/Legacy/Filter/CriterionQueryBuilder/Content/ObjectStateIdQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,23 @@ public function buildQueryConstraint(
FilteringQueryBuilder $queryBuilder,
FilteringCriterion $criterion
): ?string {
static $counter = 1;
$tableAlias = 'object_state_link_' . $counter;
++$counter;
vidarl marked this conversation as resolved.
Show resolved Hide resolved

/** @var \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateId $criterion */
$queryBuilder
->joinOnce(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider it as a non merge blocking comment:

Just a remark - if we will always generate custom table alias for each ObjectStateId criteria, then it would make sense to switch into simpler QueryBuilder::join, which does not contain additional checks against table uniqueness.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.. Changed joinOnce() into a join()

'content',
Gateway::OBJECT_STATE_LINK_TABLE,
'object_state_link',
'content.id = object_state_link.contentobject_id',
$tableAlias,
'content.id = ' . $tableAlias . '.contentobject_id',
);

$value = (array)$criterion->value;

return $queryBuilder->expr()->in(
'object_state_link.contentobject_state_id',
$tableAlias . '.contentobject_state_id',
$queryBuilder->createNamedParameter($value, Connection::PARAM_INT_ARRAY)
);
}
Expand Down
Loading