diff options
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 4 | ||||
| -rwxr-xr-x | activerecord/test/associations_test.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 9e94d70972..21879adb77 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -78,7 +78,9 @@ module ActiveRecord options[:order] = @options[:order] end - @association_class.find(args.size == 1 ? args.first : args, options) + # Pass through args exactly as we received them. + args << options + @association_class.find(*args) end end diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 6fb8757153..52dc1a7359 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -316,7 +316,7 @@ class HasManyAssociationsTest < Test::Unit::TestCase end def test_find_ids - firm = Firm.find_first + firm = Firm.find(:first) assert_raises(ActiveRecord::RecordNotFound) { firm.clients.find } |