Issue627: Delete of soft deleted rows fails #628
Merged
Conversation
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
Added 'withSoftDelete:true' to delete so that soft deleted rows can be removed.
Added unit test for deleting a previously soft deleted row.
MrMage
reviewed
May 3, 2019
| /// - returns: Future that will be completed when the delete is done. | ||
| public func delete(force: Bool = false, on conn: DatabaseConnectable) -> Future<Void> { | ||
| return Self.query(on: conn).delete(self, force: force) | ||
| return Self.query(on: conn, withSoftDeleted: true).delete(self, force: force) |
There was a problem hiding this comment.
I think withSoftDeleted should only be true if force is true as well.
There was a problem hiding this comment.
I agree. I'll add a case to the unit test and update the code.
There was a problem hiding this comment.
I've updated the code and extended the unit tests to cover the deletedAt property.
Added a test of the behavior of the updatedAt and deletedAt timestamps under soft delete.
Changed delete query based on value of 'force'.
Added second test to withSchema
Restructured to parallel BenchmarkTimestampable.swift.
Local only
This reverts commit d92d4cb.
Need to read the row after soft delete to fetch the deletedAt setting.
Oops. Must have withSoftDeleted set to true.
gwynne
approved these changes
Oct 6, 2019
tanner0101
approved these changes
Oct 7, 2019
There was a problem hiding this comment.
This LGTM, thank you!
I've created an issue here to double-check that Fluent 4 behaves correctly as well: vapor/fluent-kit#77
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Simple fix and associated unit test.