Skip to content

Don't use LIKE query when we have the full uid #30155

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

Closed
artonge wants to merge 1 commit into from
Closed

Don't use LIKE query when we have the full uid #30155

Show file tree
Hide file tree
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: 12 additions & 3 deletions apps/dav/lib/CardDAV/CardDavBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,6 +1062,7 @@ private function searchByAddressBookIds(array $addressBookIds,
array $searchProperties,
array $options = []): array {
$escapePattern = !\array_key_exists('escape_like_param', $options) || $options['escape_like_param'] !== false;
$strictSearch = array_key_exists('strict_search', $options) && $options['strict_search'] === true;

$query2 = $this->db->getQueryBuilder();

Expand Down Expand Up @@ -1103,10 +1104,18 @@ private function searchByAddressBookIds(array $addressBookIds,

// No need for like when the pattern is empty
if ('' !== $pattern) {
if (!$escapePattern) {
$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
if ($strictSearch) {
if (!$escapePattern) {
$query2->andWhere( $query2->expr()->eq('cp.value', $query2->createNamedParameter($pattern)));
} else {
$query2->andWhere( $query2->expr()->eq('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
}
} else {
$query2->andWhere($query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
if (!$escapePattern) {
$query2->andWhere( $query2->expr()->ilike('cp.value', $query2->createNamedParameter($pattern)));
} else {
$query2->andWhere( $query2->expr()->ilike('cp.value', $query2->createNamedParameter('%' . $this->db->escapeLikeParameter($pattern) . '%')));
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Federation/CloudIdManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function resolveCloudId(string $cloudId): ICloudId {
}

protected function getDisplayNameFromContact(string $cloudId): ?string {
$addressBookEntries = $this->contactsManager->search($cloudId, ['CLOUD']);
$addressBookEntries = $this->contactsManager->search($cloudId, ['CLOUD'], ["strict_search" => true]);
foreach ($addressBookEntries as $entry) {
if (isset($entry['CLOUD'])) {
foreach ($entry['CLOUD'] as $cloudID) {
Expand Down