aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/validations
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2013-11-26 04:59:18 +0900
committerRyuta Kamizono <kamipo@gmail.com>2013-11-26 04:59:18 +0900
commit501ae92a32285528c8bbdcf2af422eadb6a63c0e (patch)
tree982ad6636414d3ecb51cd98a37dcb40669c0decc /activerecord/lib/active_record/validations
parenta6900a20739cf372e47a8f19954b11005a24de3d (diff)
downloadrails-501ae92a32285528c8bbdcf2af422eadb6a63c0e.tar.gz
rails-501ae92a32285528c8bbdcf2af422eadb6a63c0e.tar.bz2
rails-501ae92a32285528c8bbdcf2af422eadb6a63c0e.zip
Only use BINARY for mysql case sensitive uniqueness check when column has a case insensitive collation.
Diffstat (limited to 'activerecord/lib/active_record/validations')
-rw-r--r--activerecord/lib/active_record/validations/uniqueness.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index 38f37f5c8a..412c0cc18a 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -59,8 +59,7 @@ module ActiveRecord
# will use SQL LOWER function before comparison, unless it detects a case insensitive collation
klass.connection.case_insensitive_comparison(table, attribute, column, value)
else
- value = klass.connection.case_sensitive_modifier(value) unless value.nil?
- table[attribute].eq(value)
+ klass.connection.case_sensitive_comparison(table, attribute, column, value)
end
end