From 705e3dfba123b7b8eb1c7ec3aa150ea9b1151de7 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Wed, 19 Feb 2014 20:57:33 +0100
Subject: [PATCH] Changed LOWER(?) to ? COLLATE NOCASE

---
 src/Models/SearchServices/TagSearchService.php | 7 ++++---
 src/Models/TagModel.php                        | 3 ++-
 src/Models/UserModel.php                       | 9 ++++++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Models/SearchServices/TagSearchService.php b/src/Models/SearchServices/TagSearchService.php
index 09520df6..0967a2f5 100644
--- a/src/Models/SearchServices/TagSearchService.php
+++ b/src/Models/SearchServices/TagSearchService.php
@@ -41,9 +41,10 @@ class TagSearchService extends AbstractSearchService
 						$token = '%' . $token;
 					$token .= '%';
 					$sqlQuery
-						->and('LOWER(tag.name)')
-						->like('LOWER(?)')
-						->put($token);
+						->and('tag.name')
+						->like('?')
+						->put($token)
+						->collate()->nocase();
 				}
 			}
 		}
diff --git a/src/Models/TagModel.php b/src/Models/TagModel.php
index 8cf0b47f..4131f5b2 100644
--- a/src/Models/TagModel.php
+++ b/src/Models/TagModel.php
@@ -119,7 +119,8 @@ class TagModel extends AbstractCrudModel
 		$query = (new SqlQuery)
 			->select('*')
 			->from('tag')
-			->where('LOWER(name) = LOWER(?)')->put($key);
+			->where('name = ?')->put($key)
+			->collate()->nocase();
 
 		$row = Database::fetchOne($query);
 		if ($row)
diff --git a/src/Models/UserModel.php b/src/Models/UserModel.php
index a7b064ce..9855ef72 100644
--- a/src/Models/UserModel.php
+++ b/src/Models/UserModel.php
@@ -89,7 +89,8 @@ class UserModel extends AbstractCrudModel
 		$query = (new SqlQuery)
 			->select('*')
 			->from('user')
-			->where('LOWER(name) = LOWER(?)')->put(trim($key));
+			->where('name = ?')->put(trim($key))
+			->collate()->nocase();
 
 		$row = Database::fetchOne($query);
 		if ($row)
@@ -105,8 +106,10 @@ class UserModel extends AbstractCrudModel
 		$query = new SqlQuery();
 		$query->select('*')
 			->from('user')
-			->where('LOWER(name) = LOWER(?)')->put(trim($key))
-			->or('LOWER(email_confirmed) = LOWER(?)')->put(trim($key));
+			->where('name = ?')->put(trim($key))
+			->collate()->nocase()
+			->or('email_confirmed = ?')->put(trim($key))
+			->collate()->nocase();
 
 		$row = Database::fetchOne($query);
 		if ($row)