aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-11-22 13:58:15 -0800
committerYves Senn <yves.senn@gmail.com>2013-11-22 13:58:15 -0800
commit818b362c1db0b1103d6489dbd6f1f56e645a34e3 (patch)
treee4c490f06fe5714c523a93b839a2e7d1c9352bb8 /activerecord/lib
parent34c08d2ead9360e1d9577dbc491d221ab66a2151 (diff)
parentc449a74e8944eed75453963288ea7a8652f5ba93 (diff)
downloadrails-818b362c1db0b1103d6489dbd6f1f56e645a34e3.tar.gz
rails-818b362c1db0b1103d6489dbd6f1f56e645a34e3.tar.bz2
rails-818b362c1db0b1103d6489dbd6f1f56e645a34e3.zip
Merge pull request #12774 from exAspArk/fix_uniqueness_on_relation
Fix validation on uniqueness
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 b55af692d6..38f37f5c8a 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -48,7 +48,7 @@ module ActiveRecord
def build_relation(klass, table, attribute, value) #:nodoc:
if reflection = klass.reflect_on_association(attribute)
attribute = reflection.foreign_key
- value = value.attributes[reflection.primary_key_column.name]
+ value = value.attributes[reflection.primary_key_column.name] unless value.nil?
end
column = klass.columns_hash[attribute.to_s]