diff options
author | Sean Griffin <sean@thoughtbot.com> | 2015-07-24 09:13:20 -0600 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2015-07-24 09:13:20 -0600 |
commit | d937a1175f10586b892842348c1d6ecaa47aad2e (patch) | |
tree | 6ecb43ac1164c564d60ed30265e81be418ca6977 /activerecord/CHANGELOG.md | |
parent | cc214cff7eb36e907df253542c8548f8bef230cb (diff) | |
download | rails-d937a1175f10586b892842348c1d6ecaa47aad2e.tar.gz rails-d937a1175f10586b892842348c1d6ecaa47aad2e.tar.bz2 rails-d937a1175f10586b892842348c1d6ecaa47aad2e.zip |
`destroy` shouldn't raise when child associations fail to save
Deep down in the association internals, we're calling `destroy!` rather
than `destroy` when handling things like `dependent` or autosave
association callbacks. Unfortunately, due to the structure of the code
(e.g. it uses callbacks for everything), it's nearly impossible to pass
whether to call `destroy` or `destroy!` down to where we actually need
it.
As such, we have to do some legwork to handle this. Since the callbacks
are what actually raise the exception, we need to rescue it in
`ActiveRecord::Callbacks`, rather than `ActiveRecord::Persistence` where
it matters. (As an aside, if this code wasn't so callback heavy, it
would handling this would likely be as simple as changing `destroy` to
call `destroy!` instead of the other way around).
Since we don't want to lose the exception when `destroy!` is called (in
particular, we don't want the value of the `record` field to change to
the parent class), we have to do some additional legwork to hold onto it
where we can use it.
Again, all of this is ugly and there is definitely a better way to do
this. However, barring a much more significant re-architecting for what
I consider to be a reletively minor improvement, I'm willing to take
this small hit to the flow of this code (begrudgingly).
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r-- | activerecord/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 8676f95d6d..99d9101347 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,10 @@ +* Don't raise an error if an association failed to destroy when `destroy` was + called on the parent (as opposed to `destroy!`). + + Fixes #20991. + + *Sean Griffin* + * 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 |