aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2016-02-21 11:28:11 +0900
committerRyuta Kamizono <kamipo@gmail.com>2016-02-22 10:03:03 +0900
commitb8f86ae29fde93b5f1e3ab75e57e4acb48a12b78 (patch)
treea7c253fa76f6b7cdb88c5b28244d6ebd28dc8612 /activerecord/lib/active_record
parentfa344194a8063bda06678868e0c2327b418c75cf (diff)
downloadrails-b8f86ae29fde93b5f1e3ab75e57e4acb48a12b78.tar.gz
rails-b8f86ae29fde93b5f1e3ab75e57e4acb48a12b78.tar.bz2
rails-b8f86ae29fde93b5f1e3ab75e57e4acb48a12b78.zip
The BINARY Operator is only needed for string columns
Follow up to #13040.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index b12bac2737..cb9cfa1012 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -608,10 +608,10 @@ module ActiveRecord
end
def case_sensitive_comparison(table, attribute, column, value)
- if value.nil? || column.case_sensitive?
- super
- else
+ if !value.nil? && column.collation && !column.case_sensitive?
table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
+ else
+ super
end
end