Fixed has_one bug with really_destroy! after destroy#428
Open
harryhlai wants to merge 2 commits intorubysherpas:corefrom
Open
Fixed has_one bug with really_destroy! after destroy#428harryhlai wants to merge 2 commits intorubysherpas:corefrom
harryhlai wants to merge 2 commits intorubysherpas:corefrom
Conversation
… logic in #restore_associated_records and leverage it for really_destroy.
2e30125 to
fa4f990
Compare
Collaborator
|
I am only seeing this now... I resolved the conflict simply by keeping both sides. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When an object and its associated objects have been soft deleted, the associations return empty collections and nil because of the default scoping. The logic for restore correctly handles this, but the logic for really_destroy (for an object that has already been soft deleted) fails for has_one associations. To see an example of this failing, look at the test case added in this PR; that test case fails with the current core branch.
This PR fixes that by refactoring the logic used in restore, and re-using it for really_destroy.