Alias id to _id for sorting

Author: GromNaN

src/Query/Builder.php

@@ -375,7 +375,7 @@ public function toMql(): array
 
             // Apply order and limit
             if ($this->orders) {
-                $pipeline[] = ['$sort' => $this->orders];
+                $pipeline[] = ['$sort' => $this->renameId($this->orders)];
             }
 
             if ($this->offset) {
@@ -416,7 +416,7 @@ public function toMql(): array
 
         // Normal query
         // Convert select columns to simple projections.
-        $projection = array_fill_keys($columns, true);
+        $projection = $this->renameId(array_fill_keys($columns, true));
 
         // Add custom projections.
         if ($this->projections) {
@@ -431,7 +431,7 @@ public function toMql(): array
         }
 
         if ($this->orders) {
-            $options['sort'] = $this->orders;
+            $options['sort'] = $this->renameId($this->orders);
         }
 
         if ($this->offset) {
@@ -1539,4 +1539,14 @@ public function orWhereIntegerNotInRaw($column, $values, $boolean = 'and')
     {
         throw new BadMethodCallException('This method is not supported by MongoDB');
     }
+
+    private function renameId(array $values): array
+    {
+        if (isset($values['id'])) {
+            $values['_id'] = $values['id'];
+            unset($values['id']);
+        }
+
+        return $values;
+    }
 }

tests/Query/BuilderTest.php

@@ -498,6 +498,11 @@ public static function provideQueryBuilderToMql(): iterable
                 ->orderBy('age', 'desc'),
         ];
 
+        yield 'orders by id field' => [
+            ['find' => [[], ['sort' => ['_id' => 1]]]],
+            fn (Builder $builder) => $builder->orderBy('id'),
+        ];
+
         yield 'orders = null' => [
             ['find' => [[], []]],
             function (Builder $builder) {
@@ -1171,6 +1176,11 @@ function (Builder $elemMatchQuery): void {
             fn (Builder $builder) => $builder->where('id', 1)->orWhere('id', 2),
         ];
 
+        yield 'select colums with id alias' => [
+            ['find' => [[], ['projection' => ['name' => 1, 'email' => 1, '_id' => 1]]]],
+            fn (Builder $builder) => $builder->select('name', 'email', 'id'),
+        ];
+
         // Method added in Laravel v10.47.0
         if (method_exists(Builder::class, 'whereAll')) {
             /** @see DatabaseQueryBuilderTest::testWhereAll */