Fix upsert handling of nullable fields #1764
Merged
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
This brings consistency to the upsert handling of fields with a null values. Non-nullable fields were not unset from the database to prevent loss of data, but nullable fields had their null value set in the daatabase. Since the object being upserted may be an incomplete object that doesn't completely represent the database state, we only write null values to the database if the upsert results in a document insertion.
jmikola
approved these changes
Mar 27, 2018
| @@ -329,11 +329,15 @@ private function executeUpsert($document, array $options) | |||
|
|
|||
| foreach (array_keys($criteria) as $field) { | |||
| unset($data['$set'][$field]); | |||
| unset($data['$inc'][$field]); | |||
| unset($data['$setOnInsert'][$field]); | |||
| } | |||
|
|
|||
| // Do not send an empty $set modifier | |||
There was a problem hiding this comment.
Perhaps this should be updated to "Do not send empty update operators"?
There was a problem hiding this comment.
Good point, changed it 👍
alcaeus
force-pushed
the
fix-upsert-nullable-fields
branch
from
805f5ef to
151f30d
Compare
jwage
approved these changes
Mar 28, 2018
malarzm
approved these changes
Mar 29, 2018
|
Merge time! Thanks @alcaeus |
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.
Based on the feedback on #1761, the handling for upserting fields with a null value is correct:
nullvalues should never overwrite pre-existing data in upsert queries, since the document being upserted is in an unknown state and we can't know for certain that the value should be unset.This PR brings this same behavior to fields with the
nullableattribute set, where an upsert would always overwrite database values with anullvalue: this is now only done if the upsert results in an insertion, thus preserving pre-existing data but ensuring the normal behavior of thenullableflag is preserved.