Skip to content

Use wildcard character matches only for Filter\Like or Filter\Unlike instances #54

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
nilmerg merged 1 commit into from
May 19, 2022
Merged

Use wildcard character matches only for Filter\Like or Filter\Unlike instances #54

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
14 changes: 7 additions & 7 deletions src/Compat/FilterProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,30 +63,30 @@ public static function assemblePredicate(Filter\Condition $filter)
$expression = $filter->getValue();

if (is_array($expression)) {
if ($filter instanceof Filter\UnEqual) {
if ($filter instanceof Filter\UnEqual || $filter instanceof Filter\Unlike) {
return ["($column NOT IN (?) OR $column IS NULL)" => $expression];
} elseif ($filter instanceof Filter\Equal) {
} elseif ($filter instanceof Filter\Equal || $filter instanceof Filter\Similar) {
return ["$column IN (?)" => $expression];
}

throw new InvalidArgumentException(
'Unable to render array expressions with operators other than equal or not equal'
);
} elseif (
($filter instanceof Filter\Equal || $filter instanceof Filter\Unequal)
($filter instanceof Filter\Similar || $filter instanceof Filter\Unlike)
&& strpos($expression, '*') !== false
) {
if ($expression === '*') {
return ["$column IS " . ($filter instanceof Filter\Equal ? 'NOT ' : '') . 'NULL'];
} elseif ($filter instanceof Filter\Unequal) {
return ["$column IS " . ($filter instanceof Filter\Similar ? 'NOT ' : '') . 'NULL'];
} elseif ($filter instanceof Filter\Unlike) {
return ["($column NOT LIKE ? OR $column IS NULL)" => str_replace('*', '%', $expression)];
} else {
return ["$column LIKE ?" => str_replace('*', '%', $expression)];
}
} elseif ($filter instanceof Filter\Unequal) {
} elseif ($filter instanceof Filter\Unequal || $filter instanceof Filter\Unlike) {
return ["($column != ? OR $column IS NULL)" => $expression];
} else {
if ($filter instanceof Filter\Equal) {
if ($filter instanceof Filter\Similar || $filter instanceof Filter\Equal) {
$operator = '=';
} elseif ($filter instanceof Filter\GreaterThan) {
$operator = '>';
Expand Down