Commit dbee100

committed

Recursively replace .id with ._id

1 parent 6f0117d commit dbee100Copy full SHA for dbee100

File tree

+70

-0

lines changed

+70

-0

lines changed

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,7 @@ public function toMql(): array`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`$wheres = $this->compileWheres();`
	`301`	`+ $wheres = $this->aliasIdForQuery($wheres);`
`301`	`302`
`302`	`303`	`// Use MongoDB's aggregation framework when using grouping or aggregation functions.`
`303`	`304`	`if ($this->groups \|\| $this->aggregate) {`
`@@ -1634,13 +1635,33 @@ private function aliasIdForQuery(array $values): array`
`1634`	`1635`	`unset($values['id']);`
`1635`	`1636`	`}`
`1636`	`1637`
	`1638`	`+ foreach ($values as $key => $value) {`
	`1639`	`+ if (is_string($key) && str_ends_with($key, '.id')) {`
	`1640`	`+ $values[substr($key, 0, -3) . '._id'] = $value;`
	`1641`	`+ unset($values[$key]);`
	`1642`	`+ }`
	`1643`	`+ }`
	`1644`	`+`
	`1645`	`+ foreach ($values as &$value) {`
	`1646`	`+ if (is_array($value)) {`
	`1647`	`+ $value = $this->aliasIdForQuery($value);`
	`1648`	`+ }`
	`1649`	`+ }`
	`1650`	`+`
`1637`	`1651`	`return $values;`
`1638`	`1652`	`}`
`1639`	`1653`
`1640`	`1654`	`private function aliasIdForResult(array $values): array`
`1641`	`1655`	`{`
`1642`	`1656`	`if (isset($values['_id'])) {`
`1643`	`1657`	`$values['id'] = $values['_id'];`
	`1658`	`+ unset($values['_id']);`
	`1659`	`+ }`
	`1660`	`+`
	`1661`	`+ foreach ($values as $key => $value) {`
	`1662`	`+ if (is_array($value)) {`
	`1663`	`+ $values[$key] = $this->aliasIdForResult($value);`
	`1664`	`+ }`
`1644`	`1665`	`}`
`1645`	`1666`
`1646`	`1667`	`return $values;`

Lines changed: 49 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,49 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+declare(strict_types=1);`
	`4`	`+`
	`5`	`+namespace MongoDB\Laravel\Tests\Ticket;`
	`6`	`+`
	`7`	`+use MongoDB\Laravel\Tests\Models\Location;`
	`8`	`+use MongoDB\Laravel\Tests\TestCase;`
	`9`	`+`
	`10`	`+/** @see https://github.com/mongodb/laravel-mongodb/issues/2783 */`
	`11`	`+class GH2489Test extends TestCase`
	`12`	`+{`
	`13`	`+ public function tearDown(): void`
	`14`	`+ {`
	`15`	`+ Location::truncate();`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ public function testQuerySubdocumentsUsingWhereInId()`
	`19`	`+ {`
	`20`	`+ Location::insert([`
	`21`	`+ [`
	`22`	`+ 'name' => 'Location 1',`
	`23`	`+ 'images' => [`
	`24`	`+ ['_id' => 1, 'uri' => 'image1.jpg'],`
	`25`	`+ ['_id' => 2, 'uri' => 'image2.jpg'],`
	`26`	`+ ],`
	`27`	`+ ],`
	`28`	`+ [`
	`29`	`+ 'name' => 'Location 2',`
	`30`	`+ 'images' => [`
	`31`	`+ ['_id' => 3, 'uri' => 'image3.jpg'],`
	`32`	`+ ['_id' => 4, 'uri' => 'image4.jpg'],`
	`33`	`+ ],`
	`34`	`+ ],`
	`35`	`+ ]);`
	`36`	`+`
	`37`	`+ // With _id`
	`38`	`+ $results = Location::whereIn('images._id', [1])->get();`
	`39`	`+`
	`40`	`+ $this->assertCount(1, $results);`
	`41`	`+ $this->assertSame('Location 1', $results->first()->name);`
	`42`	`+`
	`43`	`+ // With id`
	`44`	`+ $results = Location::whereIn('images.id', [1])->get();`
	`45`	`+`
	`46`	`+ $this->assertCount(1, $results);`
	`47`	`+ $this->assertSame('Location 1', $results->first()->name);`
	`48`	`+ }`
	`49`	`+}`

Comments

(0)