Skip to content

Optimize queries for taxonomies, following #1541 #1619

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
bobdenotter merged 2 commits into from
Jul 10, 2020
Merged

Optimize queries for taxonomies, following #1541 #1619

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6c660
Update SelectQuery.php
JTNMW Jul 8, 2020
2e70749
Whitespace fixes
bobdenotter Jul 9, 2020
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
12 changes: 5 additions & 7 deletions src/Storage/SelectQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,12 @@ public function doFieldJoins(): void
$innerQuery->andWhere($fieldsAlias . '.name = :' . $keyParam);
$this->qb->setParameter($keyParam, $key);
} else {
//added to include taxonomies to be searched as part of contenttype filter at the backend if anyField param is set.
//added to include taxonomies to be searched as part of contenttype filter at the backend and frontend if anyField param is set.
foreach ($filter->getParameters() as $value) {
foreach ($this->getTaxonomyFields() as $key) {
$innerQuery->innerJoin($contentAlias . '.taxonomies', 'taxonomies_' . $key);
$this->qb->setParameter($key . '_1', $value);
$filterExpression = sprintf('LOWER(taxonomies_%s.slug) LIKE :%s', $key, $key . '_1');
$innerQuery->orWhere($filterExpression);
}
$innerQuery->innerJoin($contentAlias . '.taxonomies', 'taxonomies_' . $index);
$this->qb->setParameter($key . '_1', $value);
$filterExpression = sprintf('LOWER(taxonomies_%s.slug) LIKE :%s', $index, $key . '_1');
$innerQuery->orWhere($filterExpression);
}
}

Expand Down