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

IBX-7236: Added support of % on both sides of a 'like' statement in fulltext criterion #298

Closed
wants to merge 7 commits into from
Closed

IBX-7236: Added support of % on both sides of a 'like' statement in fulltext criterion #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a32ef4
Added support of % on both sides of like statement in fulltext criterion
kisztof Nov 29, 2023
f7f4fc3
Apply suggestions from code review
kisztof Nov 29, 2023
9803516
Restored checking if token contains wildcards
kisztof Nov 30, 2023
3b09892
Tests
kisztof Dec 1, 2023
44859ab
Fixed code styles
kisztof Dec 1, 2023
889f301
Fixed argument position for str_contains
kisztof Dec 1, 2023
9aca6a1
Applied code review suggestion
kisztof Dec 1, 2023
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
19 changes: 11 additions & 8 deletions src/lib/Search/Legacy/Content/Common/Gateway/CriterionHandler/FullText.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,20 @@ protected function tokenizeString($string)
*/
protected function getWordExpression(QueryBuilder $query, string $token): string
{
if ($this->configuration['enableWildcards'] && $token[0] === '*') {
return $query->expr()->like(
'word',
$query->createNamedParameter('%' . substr($token, 1))
);
}
$hasLeadingWildcard = str_starts_with($token, '*');
$hasTrailingWildcard = str_ends_with($token, '*');
if ($this->configuration['enableWildcards'] && ($hasLeadingWildcard || $hasTrailingWildcard)) {
$token = $hasLeadingWildcard ? substr($token, 1) : $token;
$token = $hasTrailingWildcard ? substr($token, 0, -1) : $token;

$token = str_replace('%', '\\%', $token);

$token = $hasLeadingWildcard ? '%' . $token : $token;
$token = $hasTrailingWildcard ? $token . '%' : $token;

if ($this->configuration['enableWildcards'] && $token[strlen($token) - 1] === '*') {
return $query->expr()->like(
'word',
$query->createNamedParameter(substr($token, 0, -1) . '%')
$query->createNamedParameter($token)
);
}

Expand Down
4 changes: 4 additions & 0 deletions tests/integration/Core/Repository/SearchServiceFulltextTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ public function providerForTestFulltextSearchSolr7(): array
'qui*',
[[1, 5, 6, 7, 11, 12, 13, 15]],
],
[
'*row*',
[[2, 5, 8, 9, 11, 12, 14, 15]],
],
Comment on lines +168 to +171
Copy link
Member

Choose a reason for hiding this comment

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

On a closer look this test doesn't test anything related to the changes. See that this entire test case is meant for advanced search capabilities. LSE does not offer them so the test gets skipped.

The test can stay to ensure feature parity (we want this to work on Solr and it seems it's doing that OOTB), but we need dedicated test testing that FullText criterion used on LSE is working too, since you're changing LSE behavior.

Prepare a content with some TextLine (ezstring) containing phrases and add several cases (negative and positive ones). Think it through - what you expect from this feature, what is not desired?

[
'+qui* +fox',
[6, [11, 13], 15],
Expand Down
Loading