aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-05 23:24:40 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-05 23:24:40 -0800
commit958d25df4a1b0d41ce5deeeb0739c93b49bbd18d (patch)
treeb3c88eb72fddee028f5616f09d999be17db4c150 /activerecord/lib
parent8f309e31057e1b26fefedb199ab0526126fb1fe4 (diff)
parent0fab103cfd6ad2cd0a49e23b88f326ac3d6a9a3e (diff)
downloadrails-958d25df4a1b0d41ce5deeeb0739c93b49bbd18d.tar.gz
rails-958d25df4a1b0d41ce5deeeb0739c93b49bbd18d.tar.bz2
rails-958d25df4a1b0d41ce5deeeb0739c93b49bbd18d.zip
Merge pull request #2325 from pyromaniac/master
Nil values uniquines validation
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/validations/uniqueness.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index d56248b928..c10611ea00 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -54,7 +54,7 @@ module ActiveRecord
def build_relation(klass, table, attribute, value) #:nodoc:
column = klass.columns_hash[attribute.to_s]
- value = column.limit ? value.to_s[0, column.limit] : value.to_s if column.text?
+ value = column.limit ? value.to_s[0, column.limit] : value.to_s if value && column.text?
if !options[:case_sensitive] && value && column.text?
# will use SQL LOWER function before comparison, unless it detects a case insensitive collation