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

Fix regression from Rails 3.1

Browse source 
Under Rails 3.1, you were allowed to pass a hash to a find_or_create
method with multiple attribute names, but this was broken as the
arguments were being improperly validated.
This commit is contained in:
Paul McMahon 2012-01-25 17:27:42 +09:00
parent f1baf8f5a4
commit 7b9baeed7c
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/dynamic_matchers.rb
View file

@ -25,7 +25,7 @@ module ActiveRecord
if match = (DynamicFinderMatch.match(method_id) || DynamicScopeMatch.match(method_id)) if match = (DynamicFinderMatch.match(method_id) || DynamicScopeMatch.match(method_id))
attribute_names = match.attribute_names attribute_names = match.attribute_names
super unless all_attributes_exists?(attribute_names) super unless all_attributes_exists?(attribute_names)
if arguments.size < attribute_names.size if !(match.is_a?(DynamicFinderMatch) && match.instantiator? && arguments.first.is_a?(Hash)) && arguments.size < attribute_names.size
method_trace = "#{__FILE__}:#{__LINE__}:in `#{method_id}'" method_trace = "#{__FILE__}:#{__LINE__}:in `#{method_id}'"
backtrace = [method_trace] + caller backtrace = [method_trace] + caller
raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace

11
activerecord/test/cases/finder_test.rb
View file

@ -881,6 +881,17 @@ class FinderTest < ActiveRecord::TestCase
assert_equal 23, sig38.client_of assert_equal 23, sig38.client_of
end end
def test_find_or_create_from_two_attributes_and_hash
number_of_companies = Company.count
sig38 = Company.find_or_create_by_name_and_firm_id({:name => "38signals", :firm_id => 17, :client_of => 23})
assert_equal number_of_companies + 1, Company.count
assert_equal sig38, Company.find_or_create_by_name_and_firm_id({:name => "38signals", :firm_id => 17, :client_of => 23})
assert sig38.persisted?
assert_equal "38signals", sig38.name
assert_equal 17, sig38.firm_id
assert_equal 23, sig38.client_of
end
def test_find_or_create_from_one_aggregate_attribute def test_find_or_create_from_one_aggregate_attribute
number_of_customers = Customer.count number_of_customers = Customer.count
created_customer = Customer.find_or_create_by_balance(Money.new(123)) created_customer = Customer.find_or_create_by_balance(Money.new(123))