aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/validations/uniqueness.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-03-06 10:13:04 +0900
committerRyuta Kamizono <kamipo@gmail.com>2019-03-07 10:53:53 +0900
commit1aece76e2548672e5a56c1459c0c1a150ea4f175 (patch)
treea61568de07792b0ff8df1bf730aa7eb4237f3dbc /activerecord/lib/active_record/validations/uniqueness.rb
parent2beb0b473606c60e5e1cbb3dac06ffa96f8ce456 (diff)
downloadrails-1aece76e2548672e5a56c1459c0c1a150ea4f175.tar.gz
rails-1aece76e2548672e5a56c1459c0c1a150ea4f175.tar.bz2
rails-1aece76e2548672e5a56c1459c0c1a150ea4f175.zip
Move all Arel constructions from uniqueness validator into connection adapter
Diffstat (limited to 'activerecord/lib/active_record/validations/uniqueness.rb')
-rw-r--r--activerecord/lib/active_record/validations/uniqueness.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index dc1be73a60..3172aa2078 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -60,9 +60,7 @@ module ActiveRecord
comparison = relation.bind_attribute(attribute, value) do |attr, bind|
return relation.none! if bind.unboundable?
- if bind.nil?
- attr.eq(bind)
- elsif !options.key?(:case_sensitive)
+ if !options.key?(:case_sensitive) || bind.nil?
klass.connection.default_uniqueness_comparison(attr, bind, klass)
elsif options[:case_sensitive]
klass.connection.case_sensitive_comparison(attr, bind)