Fix upserts for documents with YAML mapping #1440
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
| @@ -146,7 +146,7 @@ public function prepareUpdateData($document) | |||
| if ($new === null && $mapping['nullable'] !== true) { | |||
| $updateData['$unset'][$mapping['name']] = true; | |||
| } else { | |||
| if ($new !== null && $mapping['strategy'] === ClassMetadataInfo::STORAGE_STRATEGY_INCREMENT) { | |||
| if ($new !== null && isset($mapping['strategy']) && $mapping['strategy'] === ClassMetadataInfo::STORAGE_STRATEGY_INCREMENT) { | |||
There was a problem hiding this comment.
I believe this line is fixing #1435 but I don't think this is covered by tests you added?
There was a problem hiding this comment.
Yeah. I see that now. I'll update the test, thanks!
There was a problem hiding this comment.
Test updated - it now checks to ensure IDs are not updated, since all other fields will have a mapping set, regardless of the driver being used.
alcaeus
force-pushed
the
fix-upsert-strategy-mishap
branch
from
95da1e5 to
09105f3
Compare
alcaeus
force-pushed
the
fix-upsert-strategy-mishap
branch
from
09105f3 to
ef6c168
Compare
|
1 step closer to 1.1.1 :) |
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.
Fixes #1435.
This also uncovered a bug where using the increment strategy for ID generation could lead to errors when upserting documents due to a name conflict with strategies.