Skip to content
Browse files

Fixed that validates_uniqueness_of used 'id' instead of defined prima…

…ry key #406

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@328 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 5ac11f2 commit f8bc7a4577c8c3a7abf0abc3b0b1080349ae7e20 @dhh dhh committed
Showing with 4 additions and 2 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +2 −2 activerecord/lib/active_record/validations.rb
View
2 activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that validates_uniqueness_of used 'id' instead of defined primary key #406
+
* Fixed that the overwritten respond_to? method didn't take two parameters like the original #391
* Added HasManyAssociation#count that works like Base#count #413 [intinig]
View
4 activerecord/lib/active_record/validations.rb
@@ -213,9 +213,9 @@ def validates_uniqueness_of(*attr_names)
for attr_name in attr_names
if scope = configuration[:scope]
- class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND id <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
+ class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND \#{primary_key} <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
else
- class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND id <> ?", #{attr_name}, id])}))
+ class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND \#{primary_key} <> ?", #{attr_name}, id])}))
end
end
end

0 comments on commit f8bc7a4

Please sign in to comment.
Something went wrong with that request. Please try again.