Skip to content

Commit

Permalink
Fix MariaDB case sensitivity
Browse files Browse the repository at this point in the history
#fix FreshRSS#4535
Collation regression from FreshRSS#4505
  • Loading branch information
Alkarex committed Aug 25, 2022
1 parent d815dd8 commit 4fd8f24
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions app/Models/EntryDAO.php
Original file line number Diff line number Diff line change
Expand Up @@ -979,15 +979,17 @@ public static function sqlBooleanSearch(string $alias, $filters, int $level = 0)
if ($filter->getSearch()) {
foreach ($filter->getSearch() as $search_value) {
$sub_search .= 'AND (' . $alias . 'title LIKE ? OR ' .
(static::isCompressed() ? 'UNCOMPRESS(' . $alias . 'content_bin)' : '' . $alias . 'content') . ' LIKE ?) ';
(static::isCompressed() ? 'CONVERT(UNCOMPRESS(' . $alias . 'content_bin) USING utf8mb4) COLLATE utf8mb4_unicode_ci' :
'' . $alias . 'content') . ' LIKE ?) ';
$values[] = "%{$search_value}%";
$values[] = "%{$search_value}%";
}
}
if ($filter->getNotSearch()) {
foreach ($filter->getNotSearch() as $search_value) {
$sub_search .= 'AND ' . $alias . 'title NOT LIKE ? AND ' .
(static::isCompressed() ? 'UNCOMPRESS(' . $alias . 'content_bin)' : '' . $alias . 'content') . ' NOT LIKE ? ';
(static::isCompressed() ? 'CONVERT(UNCOMPRESS(' . $alias . 'content_bin) USING utf8mb4) COLLATE utf8mb4_unicode_ci' :
'' . $alias . 'content') . ' NOT LIKE ? ';
$values[] = "%{$search_value}%";
$values[] = "%{$search_value}%";
}
Expand Down

0 comments on commit 4fd8f24

Please sign in to comment.