Skip to content

O
OHR Support
Commit a47a7a2b authored by Eric Davis's avatar Eric Davis
Browse files
Options

Merge branch '171-user_test_fails_with_mysql2'

parents 7973847e 49b789e1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
app/models/user.rb
View file @ a47a7a2b
......@@ -279,8 +279,7 @@ class User < Principal
# version. Exact matches will be given priority.
def self.find_by_login(login)
# force string comparison to be case sensitive on MySQL
type_cast = (ActiveRecord::Base.connection.adapter_name == 'MySQL') ? 'BINARY' : ''
type_cast = (ActiveRecord::Base.connection.adapter_name =~ /mysql/i) ? 'BINARY' : ''
# First look for an exact match
user = first(:conditions => ["#{type_cast} login = ?", login])
# Fail over to case-insensitive if none was found
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment