diff options
author | Sameer Rahmani <lxsameer@gnu.org> | 2015-07-21 18:49:09 +0430 |
---|---|---|
committer | Sameer Rahmani <lxsameer@gnu.org> | 2015-07-21 19:19:14 +0430 |
commit | d763956ed95bce581f12151a5ed4df12bcefdeee (patch) | |
tree | d79749c8598debbba48a6f6d81442f60157c7361 /activerecord/lib/active_record/core.rb | |
parent | 36ea89a80c502067bf513b6d16a547411511fae8 (diff) | |
download | rails-d763956ed95bce581f12151a5ed4df12bcefdeee.tar.gz rails-d763956ed95bce581f12151a5ed4df12bcefdeee.tar.bz2 rails-d763956ed95bce581f12151a5ed4df12bcefdeee.zip |
Extra caller details added to ActiveRecord::RecordNotFound
ActiveRecord::RecordNotFound modified to store model name, primary_key
and id of the caller model. It allows the catcher of this exception to make
a better decision to what to do with it. For example consider this simple
example:
class SomeAbstractController < ActionController::Base
rescue_from ActiveRecord::RecordNotFound, with: :redirect_to_404
private def redirect_to_404(e)
return redirect_to(posts_url) if e.model == 'Post'
raise
end
end
Diffstat (limited to 'activerecord/lib/active_record/core.rb')
-rw-r--r-- | activerecord/lib/active_record/core.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index b82488a59c..ffce2173ec 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -162,11 +162,13 @@ module ActiveRecord } record = statement.execute([id], self, connection).first unless record - raise RecordNotFound, "Couldn't find #{name} with '#{primary_key}'=#{id}" + raise RecordNotFound.new("Couldn't find #{name} with '#{primary_key}'=#{id}", + name, primary_key, id) end record rescue RangeError - raise RecordNotFound, "Couldn't find #{name} with an out of range value for '#{primary_key}'" + raise RecordNotFound.new("Couldn't find #{name} with an out of range value for '#{primary_key}'", + name, primary_key) end def find_by(*args) # :nodoc: @@ -199,7 +201,7 @@ module ActiveRecord end def find_by!(*args) # :nodoc: - find_by(*args) or raise RecordNotFound.new("Couldn't find #{name}") + find_by(*args) or raise RecordNotFound.new("Couldn't find #{name}", name) end def initialize_generated_modules # :nodoc: |