ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Changed LOWER(?) to ? COLLATE NOCASE

Browse source
This commit is contained in:
Marcin Kurczewski 2014-02-19 20:57:33 +01:00
parent dd498cf18d
commit 705e3dfba1
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Models/SearchServices/TagSearchService.php
View file

@ -41,9 +41,10 @@ class TagSearchService extends AbstractSearchService
$token = '%' . $token; $token = '%' . $token;
$token .= '%'; $token .= '%';
$sqlQuery $sqlQuery
->and('LOWER(tag.name)') ->and('tag.name')
->like('LOWER(?)') ->like('?')
->put($token); ->put($token)
->collate()->nocase();
} }
} }
} }

3
src/Models/TagModel.php
View file

@ -119,7 +119,8 @@ class TagModel extends AbstractCrudModel
$query = (new SqlQuery) $query = (new SqlQuery)
->select('*') ->select('*')
->from('tag') ->from('tag')
->where('LOWER(name) = LOWER(?)')->put($key); ->where('name = ?')->put($key)
->collate()->nocase();
$row = Database::fetchOne($query); $row = Database::fetchOne($query);
if ($row) if ($row)

9
src/Models/UserModel.php
View file

@ -89,7 +89,8 @@ class UserModel extends AbstractCrudModel
$query = (new SqlQuery) $query = (new SqlQuery)
->select('*') ->select('*')
->from('user') ->from('user')
->where('LOWER(name) = LOWER(?)')->put(trim($key)); ->where('name = ?')->put(trim($key))
->collate()->nocase();
$row = Database::fetchOne($query); $row = Database::fetchOne($query);
if ($row) if ($row)
@ -105,8 +106,10 @@ class UserModel extends AbstractCrudModel
$query = new SqlQuery(); $query = new SqlQuery();
$query->select('*') $query->select('*')
->from('user') ->from('user')
->where('LOWER(name) = LOWER(?)')->put(trim($key)) ->where('name = ?')->put(trim($key))
->or('LOWER(email_confirmed) = LOWER(?)')->put(trim($key)); ->collate()->nocase()
->or('email_confirmed = ?')->put(trim($key))
->collate()->nocase();
$row = Database::fetchOne($query); $row = Database::fetchOne($query);
if ($row) if ($row)