Skip to content

FilterProcessor: Inject column expressions directly into filters #81

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

Draft
nilmerg wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

FilterProcessor: Inject column expressions directly into filters #81

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
15 changes: 15 additions & 0 deletions src/Compat/FilterProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use ipl\Orm\Relation;
use ipl\Orm\UnionQuery;
use ipl\Sql\Expression;
use ipl\Sql\ExpressionInterface;
use ipl\Sql\Filter\Exists;
use ipl\Sql\Filter\NotExists;
use ipl\Stdlib\Contract\Filterable;
Expand Down Expand Up @@ -128,6 +129,20 @@ protected function requireAndResolveFilterColumns(Filter\Rule $filter, Query $qu
throw new InvalidColumnException($columnName, $subject);
}

$columns = $subject->getColumns();
if (isset($columns[$columnName]) && $columns[$columnName] instanceof ExpressionInterface) {
$expression = clone $columns[$columnName];
$expression->setColumns($resolver->qualifyColumns(
$resolver->requireAndResolveColumns(
$columns[$columnName]->getColumns(),
$subject
),
$subject
));

$filter->setColumn($query->getDb()->getQueryBuilder()->buildExpression($expression));
}

if ($relationPath !== $baseTable) {
$query->utilize($relationPath);
$this->madeJoins[$relationPath][] = $filter;
Expand Down