kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Disambiguate table names for columns in validates_uniquness_of's WHERE clause. Closes #3423.

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3402 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Marcel Molina 2006-01-13 01:51:45 +00:00
parent 2b7f1cdbe9
commit f1a01c80db
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN* *SVN*
* Disambiguate table names for columns in validates_uniquness_of's WHERE clause. #3423 [alex.borovsky@gmail.com]
* .with_scope imposed create parameters now bypass attr_protected [Tobias Luetke] * .with_scope imposed create parameters now bypass attr_protected [Tobias Luetke]
* Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. [Marcel Molina Jr.] * Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. [Marcel Molina Jr.]

6
activerecord/lib/active_record/validations.rb
View file

@ -496,17 +496,17 @@ module ActiveRecord
configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash) configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
validates_each(attr_names,configuration) do |record, attr_name, value| validates_each(attr_names,configuration) do |record, attr_name, value|
condition_sql = "#{attr_name} #{attribute_condition(value)}" condition_sql = "#{record.class.table_name}.#{attr_name} #{attribute_condition(value)}"
condition_params = [value] condition_params = [value]
if scope = configuration[:scope] if scope = configuration[:scope]
Array(scope).map do |scope_item| Array(scope).map do |scope_item|
scope_value = record.send(scope_item) scope_value = record.send(scope_item)
condition_sql << " AND #{scope_item} #{attribute_condition(scope_value)}" condition_sql << " AND #{record.class.table_name}.#{scope_item} #{attribute_condition(scope_value)}"
condition_params << scope_value condition_params << scope_value
end end
end end
unless record.new_record? unless record.new_record?
condition_sql << " AND #{record.class.primary_key} <> ?" condition_sql << " AND #{record.class.table_name}.#{record.class.primary_key} <> ?"
condition_params << record.send(:id) condition_params << record.send(:id)
end end
if record.class.find(:first, :conditions => [condition_sql, *condition_params]) if record.class.find(:first, :conditions => [condition_sql, *condition_params])