GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[SEARCH][PostgreSQL] Make LIKE search case-insensitive

Browse Source
This commit is contained in:
Alexei Sorokin 2020-08-16 19:05:47 +03:00 committed by Diogo Peralta Cordeiro
parent 598e8e4d56
commit 86826a1a68
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/search/search_engines.php
View File

@ -196,30 +196,40 @@ class SQLLikeSearch extends SearchEngine
{ {
public function query($q) public function query($q)
{ {
$q_escaped = $this->target->escape(mb_strtolower($q), true);
$cols = [];
if ($this->table === 'profile') { if ($this->table === 'profile') {
$qry = sprintf( $cols = ['nickname', 'fullname', 'location', 'bio', 'homepage'];
'( %2$s.nickname LIKE \'%%%1$s%%\' ' .
' OR %2$s.fullname LIKE \'%%%1$s%%\' ' .
' OR %2$s.location LIKE \'%%%1$s%%\' ' .
' OR %2$s.bio LIKE \'%%%1$s%%\' ' .
' OR %2$s.homepage LIKE \'%%%1$s%%\')',
$this->target->escape($q, true),
$this->table
);
} elseif ($this->table === 'notice') { } elseif ($this->table === 'notice') {
// Don't show direct messages. // Don't show direct messages.
$this->target->whereAdd('notice.scope <> ' . Notice::MESSAGE_SCOPE); $this->target->whereAdd('notice.scope <> ' . Notice::MESSAGE_SCOPE);
// Don't show imported notices // Don't show imported notices
$this->target->whereAdd('notice.is_local <> ' . Notice::GATEWAY); $this->target->whereAdd('notice.is_local <> ' . Notice::GATEWAY);
$qry = sprintf( $cols = ['content'];
'notice.content LIKE \'%%%1$s%%\'',
$this->target->escape($q, true)
);
} else { } else {
throw new ServerException('Unknown table: ' . $this->table); throw new ServerException('Unknown table: ' . $this->table);
} }
$conds = [];
foreach ($cols as $col) {
switch (common_config('db', 'type')) {
case 'pgsql':
// Faster than with the LOWER function
$cond = "{$this->table}.{$col} ILIKE";
break;
case 'mysql':
// Case-insensitive collation
$cond = "{$this->table}.{$col} LIKE";
break;
default:
$cond = "LOWER({$this->table}.{$col}) LIKE";
}
$conds[] = $cond . " '%" . $q_escaped . "%'";
}
$qry = '(' . implode(' OR ', $conds) . ')';
$this->target->whereAdd($qry); $this->target->whereAdd($qry);
return true; return true;