diff options
| author | Paul McMahon <paul@mobalean.com> | 2012-01-25 17:27:42 +0900 |
|---|---|---|
| committer | Paul McMahon <paul@mobalean.com> | 2012-01-27 09:37:14 +0900 |
| commit | 7b9baeed7cbcd896bbd4345ce3d9e95fb51ecb99 (patch) | |
| tree | 1f2ce9e75645cb81f6e2f2262cab0a7ff4d5159a /activerecord/lib | |
| parent | f1baf8f5a4fe0dc98b36380498db747d3be5d316 (diff) | |
| download | rails-7b9baeed7cbcd896bbd4345ce3d9e95fb51ecb99.tar.gz rails-7b9baeed7cbcd896bbd4345ce3d9e95fb51ecb99.tar.bz2 rails-7b9baeed7cbcd896bbd4345ce3d9e95fb51ecb99.zip | |
Fix regression from Rails 3.1
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.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/dynamic_matchers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/dynamic_matchers.rb b/activerecord/lib/active_record/dynamic_matchers.rb index e9068089f0..b6b8e24436 100644 --- a/activerecord/lib/active_record/dynamic_matchers.rb +++ b/activerecord/lib/active_record/dynamic_matchers.rb @@ -25,7 +25,7 @@ module ActiveRecord if match = (DynamicFinderMatch.match(method_id) || DynamicScopeMatch.match(method_id)) attribute_names = match.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}'" backtrace = [method_trace] + caller raise ArgumentError, "wrong number of arguments (#{arguments.size} for #{attribute_names.size})", backtrace |