PHPORM-255 Enable disabling the id to _id field rename in embedded documents
#3332
Conversation
| @@ -1805,7 +1807,7 @@ private function aliasIdForQuery(array $values): array | |||
|
|
|||
| foreach ($values as &$value) { | |||
| if (is_array($value)) { | |||
| $value = $this->aliasIdForQuery($value); | |||
| $value = $this->aliasIdForQuery($value, false); | |||
There was a problem hiding this comment.
Note that this appears to be the only recursive call to aliasIdForQuery(). All other calls (e.g. preparing projections, wheres) are invoked at the root level.
| @@ -1823,10 +1825,13 @@ private function aliasIdForQuery(array $values): array | |||
| * | |||
| * @template T of array|object | |||
| */ | |||
| public function aliasIdForResult(array|object $values): array|object | |||
| public function aliasIdForResult(array|object $values, bool $root = true): array|object | |||
There was a problem hiding this comment.
There appear to be two calls to aliasIdForResult() from MongoDB\Laravel\Eloquent\Builder::raw() (see: search results).
The context suggests that you're only processing a single document, but in one case you call iterator_to_array() on a cursor (which suggests it'd be handling multiple results instead of just one).
Neither of the aliasIdForResult() calls there seem affected by this change, since $root: false is only used when recursing, but it'd be worth confirming.
There was a problem hiding this comment.
Good catch, that's fixed by using array_map.
There was a problem hiding this comment.
Just to confirm, this fix was necessary to get the test case for multiple results passing?
There was a problem hiding this comment.
Previously, the function was called with $root = true on the list of document, and then each document root had $root = false because the function was called recursively. Using array_map, I'm calling aliasIdForResult on the documents directly, instead of the collection of documents.
| @@ -1600,12 +1599,38 @@ public static function getEloquentMethodsNotSupported() | |||
| yield 'orWhereIntegerNotInRaw' => [fn (Builder $builder) => $builder->orWhereIntegerNotInRaw('id', ['1a', 2])]; | |||
| } | |||
|
|
|||
| private static function getBuilder(): Builder | |||
| public function testRenameEmbeddedIdFieldCanBeDisabled() | |||
There was a problem hiding this comment.
Does this test exercise both aliasIdForQuery and aliasIdForResult()?
There was a problem hiding this comment.
Thanks for this question, I added a full test to cover both.
| @@ -1823,10 +1825,13 @@ private function aliasIdForQuery(array $values): array | |||
| * | |||
| * @template T of array|object | |||
| */ | |||
| public function aliasIdForResult(array|object $values): array|object | |||
| public function aliasIdForResult(array|object $values, bool $root = true): array|object | |||
There was a problem hiding this comment.
Just to confirm, this fix was necessary to get the test case for multiple results passing?
Fix PHPORM-255
Fix #3184
To disable the automatic conversion of
idto_idand storeidfields in the database for embedded documents, set the connection setting using the new method:Checklist