Fix id alias in nested array

Author: GromNaN

src/Query/Builder.php

@@ -1038,11 +1038,6 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
     {
         $params = func_get_args();
 
-        // Compatibility with Eloquent queries that uses "id" instead of MongoDB's _id
-        if ($column === 'id') {
-            $params[0] = $column = '_id';
-        }
-
         // Remove the leading $ from operators.
         if (func_num_args() >= 3) {
             $operator = &$params[1];
@@ -1090,16 +1085,21 @@ protected function compileWheres(): array
             // Convert column name to string to use as array key
             if (isset($where['column'])) {
                 $where['column'] = (string) $where['column'];
-            }
 
-            // Convert id's.
-            if (isset($where['column']) && ($where['column'] === '_id' || str_ends_with($where['column'], '._id'))) {
-                if (isset($where['values'])) {
-                    // Multiple values.
-                    $where['values'] = array_map($this->convertKey(...), $where['values']);
-                } elseif (isset($where['value'])) {
-                    // Single value.
-                    $where['value'] = $this->convertKey($where['value']);
+                // Compatibility with Eloquent queries that uses "id" instead of MongoDB's _id
+                if ($where['column'] === 'id') {
+                    $where['column'] = '_id';
+                }
+
+                // Convert id's.
+                if ($where['column'] === '_id' || str_ends_with($where['column'], '._id')) {
+                    if (isset($where['values'])) {
+                        // Multiple values.
+                        $where['values'] = array_map($this->convertKey(...), $where['values']);
+                    } elseif (isset($where['value'])) {
+                        // Single value.
+                        $where['value'] = $this->convertKey($where['value']);
+                    }
                 }
             }
 

tests/Query/BuilderTest.php

@@ -124,9 +124,10 @@ public static function provideQueryBuilderToMql(): iterable
         ];
 
         // Nested array are not flattened like in the Eloquent builder. MongoDB can compare objects.
+        // When id is used as data field name, it's not converted to _id
         $array = [['issue' => 45582], ['id' => 2], [3]];
         yield 'whereIn nested array' => [
-            ['find' => [['id' => ['$in' => $array]], []]],
+            ['find' => [['_id' => ['$in' => $array]], []]],
             fn (Builder $builder) => $builder->whereIn('id', $array),
         ];
 
@@ -170,7 +171,7 @@ public static function provideQueryBuilderToMql(): iterable
 
         /** @see DatabaseQueryBuilderTest::testEmptyWhereIns */
         yield 'whereIn empty array' => [
-            ['find' => [['id' => ['$in' => []]], []]],
+            ['find' => [['_id' => ['$in' => []]], []]],
             fn (Builder $builder) => $builder->whereIn('id', []),
         ];
 
@@ -553,12 +554,12 @@ function (Builder $builder) {
 
         /** @see DatabaseQueryBuilderTest::testWhereBetweens() */
         yield 'whereBetween array of numbers' => [
-            ['find' => [['id' => ['$gte' => 1, '$lte' => 2]], []]],
+            ['find' => [['_id' => ['$gte' => 1, '$lte' => 2]], []]],
             fn (Builder $builder) => $builder->whereBetween('id', [1, 2]),
         ];
 
         yield 'whereBetween nested array of numbers' => [
-            ['find' => [['id' => ['$gte' => [1], '$lte' => [2, 3]]], []]],
+            ['find' => [['_id' => ['$gte' => [1], '$lte' => [2, 3]]], []]],
             fn (Builder $builder) => $builder->whereBetween('id', [[1], [2, 3]]),
         ];
 
@@ -579,7 +580,7 @@ function (Builder $builder) {
         ];
 
         yield 'whereBetween collection' => [
-            ['find' => [['id' => ['$gte' => 1, '$lte' => 2]], []]],
+            ['find' => [['_id' => ['$gte' => 1, '$lte' => 2]], []]],
             fn (Builder $builder) => $builder->whereBetween('id', collect([1, 2])),
         ];