diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
commit | 248391a7e11e9fa5ffe312cb380034691430acc5 (patch) | |
tree | 0d151f54139732c417f3d4242e13f1aac64ac858 /activerecord/lib/active_record/base.rb | |
parent | 86abd6887dac9ee233740399f9e5758309af512e (diff) | |
parent | a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763 (diff) | |
download | rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.gz rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.bz2 rails-248391a7e11e9fa5ffe312cb380034691430acc5.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 87c0002463..dfead0b94f 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1829,7 +1829,7 @@ module ActiveRecord #:nodoc: else find(:#{finder}, options.merge(finder_options)) end - #{'result || raise(RecordNotFound)' if bang} + #{'result || raise(RecordNotFound, "Couldn\'t find #{name} with #{attributes.to_a.collect {|pair| "#{pair.first} = #{pair.second}"}.join(\', \')}")' if bang} end }, __FILE__, __LINE__ send(method_id, *arguments) |