aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-03-11 19:10:29 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-03-11 19:10:29 -0300
commiteefcc78f7a7d75709bdf03d21d6b039853d06ccf (patch)
treeb3cd93b01cebe61daca2f13b4b00e2a4aad45531 /activerecord/lib
parent12cce89c89b48b15dcf2fcdb41feaaa5b7c06991 (diff)
parentb8f86ae29fde93b5f1e3ab75e57e4acb48a12b78 (diff)
downloadrails-eefcc78f7a7d75709bdf03d21d6b039853d06ccf.tar.gz
rails-eefcc78f7a7d75709bdf03d21d6b039853d06ccf.tar.bz2
rails-eefcc78f7a7d75709bdf03d21d6b039853d06ccf.zip
Merge pull request #23797 from kamipo/case_sensitive_comparison_for_non_string_column
The BINARY Operator is only needed for string columns
Diffstat (limited to 'activerecord/lib')
-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 f453e717ed..22b71fbaba 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -607,10 +607,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