[6.0] Don't add soft delete query filter on hard delete models #321
Conversation
This file contains 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
nunomaduro
approved these changes
Nov 19, 2018
driesvints
changed the title
|
@taylorotwell thanks for the merge. Is there a process to tagging / releasing new code changes? |
|
@jhoff tagged 6.1.0 |
|
@driesvints Thank you sir! |
|
I had already submitted a new issue ( #338 ) on this before I saw this thread, but I am having this exact issue on v6.1.3 The trait is being applied still, regardless of the config setting. |
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.
Currently, when the static
searchmethod from theSearchabletrait is called, a new scout query builder is instantiated and the$softDeleteflag is based only onconfig('scout.soft_delete').The builder should only apply soft deletes if the model that is being searched also uses them.
It seems that Algolia ignores the additional
__soft_deletefilter when it it passed in a search that doesn't use soft deletes, but other drivers have to go out of the way to fix this deficiency ( See this section in the tnt search driver as an example )This pull request fixes the searchable trait to only apply the soft delete filter when the model being searched actually uses soft deletes.