-
Notifications
You must be signed in to change notification settings - Fork 1.5k
PHPORM-369: Fix ID handling when using insert method instead of save #3429
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+68
−1
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace MongoDB\Laravel\Tests\Models; | ||
|
||
use Illuminate\Database\Eloquent\Model; | ||
use MongoDB\Laravel\Eloquent\DocumentModel; | ||
|
||
/** | ||
* @property string $id | ||
* @property string $name | ||
*/ | ||
class NonIncrementing extends Model | ||
{ | ||
use DocumentModel; | ||
|
||
protected $keyType = 'string'; | ||
protected $connection = 'mongodb'; | ||
|
||
protected $fillable = [ | ||
'name', | ||
]; | ||
protected static $unguarded = true; | ||
public $incrementing = false; | ||
} |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noted in #3428 (comment) you mentioned that
$incrementing = true
(Eloquent's default per Primary Keys) was responsible for a different code path being utilized.Assuming this library is going to generate ObjectIds regardless, I would think it'd be ideal if
$incrementing
had absolutely no effect on our behavior. Is this something we have no control over (within reason)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noted that this goes back to
Illuminate\Database\Eloquent\Model::performInsert()
.When
$incrementing
istrue
,Model::insertAndSetId()
relies onBuilder::insertGetId()
(where$values
appears to be a single document). Otherwise, it delegates toBuilder::insert()
, which has the logic to wrap the singular document in an array before applyingaliasIdForQuery()
.So the bug fix looks correct. I think there's still an edge case in the "document or documents?" detection within
Builder::insert()
, but that' outside the scope of this PR. This assumption could be problematic if all fields in a document were arrays (e.g._id
is an embedded document):