[Fix] BelongsToMany sync does't use configured keys #2667
Conversation
This comment was marked as spam.
This comment was marked as spam.
| @@ -76,7 +76,7 @@ protected function setWhere() | |||
| { | |||
| $foreign = $this->getForeignKey(); | |||
|
|
|||
| $this->query->where($foreign, '=', $this->parent->getKey()); | |||
| $this->query->where($foreign, '=', $this->parent->{$this->parentKey}); | |||
There was a problem hiding this comment.
When a custom parentKey is defined, the custom parentKey's value must be searched in the foreign keys list instead of _id.
| @@ -116,7 +116,7 @@ public function sync($ids, $detaching = true) | |||
| ]; | |||
|
|
|||
| if ($ids instanceof Collection) { | |||
| $ids = $ids->modelKeys(); | |||
| $ids = $this->parseIds($ids); | |||
There was a problem hiding this comment.
As mentioned in #2666, $ids->modelKeys() returns _id field or primary key. However, $this->parseIds($ids) returns relatedKey which is the primary key by default.
| @@ -190,10 +190,10 @@ public function attach($id, array $attributes = [], $touch = true) | |||
|
|
|||
| $query = $this->newRelatedQuery(); | |||
|
|
|||
| $query->whereIn($this->related->getKeyName(), (array) $id); | |||
| $query->whereIn($this->relatedKey, (array) $id); | |||
There was a problem hiding this comment.
As I said in the previous comment, relatedKey is $this->related->getKeyName() by default but respects our override.
|
|
||
| // Attach the new parent id to the related model. | ||
| $query->push($this->foreignPivotKey, $this->parent->getKey(), true); | ||
| $query->push($this->foreignPivotKey, $this->parent->{$this->parentKey}, true); |
There was a problem hiding this comment.
The $this->parentKey is replaced with $this->parent->getKey() to respect the custom parentKey field.
| @@ -255,36 +260,6 @@ public function testBelongsToMany(): void | |||
| $this->assertCount(1, $client->users); | |||
| } | |||
|
|
|||
| public function testSyncBelongsToMany() | |||
There was a problem hiding this comment.
I merged this test with testBelongsToManySync test. because I see no reason to keep them separate and I think it's cleaner now.
Rename skills relationship name to skillsWithCustomRelatedKey.
|
Thank you @hans-thomas. |
Hi there,
In this PR, I fix #2666 issue. There were other bugs in using a
BelongsToManyrelationship with customrelatedKeyorparentKeythat I will explain in the comments.