kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Force string comparison for login search to be case sensitive on MySQL. #2473 

Contributed by Holger Just.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3813 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-06-24 03:08:20 +00:00
parent 6eea3300f8
commit 672852baaf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/user.rb
View File

@ -225,10 +225,13 @@ class User < Principal
# Find a user account by matching the exact login and then a case-insensitive # Find a user account by matching the exact login and then a case-insensitive
# version. Exact matches will be given priority. # version. Exact matches will be given priority.
def self.find_by_login(login) def self.find_by_login(login)
# force string comparison to be case sensitive on MySQL
type_cast = (ActiveRecord::Base.connection.adapter_name == 'MySQL') ? 'BINARY' : ''
# First look for an exact match # First look for an exact match
user = first(:conditions => {:login => login}) user = first(:conditions => ["#{type_cast} login = ?", login])
# Fail over to case-insensitive if none was found # Fail over to case-insensitive if none was found
user ||= first(:conditions => ["LOWER(login) = ?", login.to_s.downcase]) user ||= first(:conditions => ["#{type_cast} LOWER(login) = ?", login.to_s.downcase])
end end
def self.find_by_rss_key(key) def self.find_by_rss_key(key)