Show dynamic search index and set type null for standard indexes

mongodb · Jan 2, 2025 · 3cac0ec · 3cac0ec
1 parent d30ab34
commit 3cac0ec
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 18 deletions.
diff --git a/src/Schema/Builder.php b/src/Schema/Builder.php
@@ -243,7 +243,7 @@ public function getIndexes($table)
                     $index->isText() => 'text',
                     $index->is2dSphere() => '2dsphere',
                     $index->isTtl() => 'ttl',
-                    default => 'default',
+                    default => null,
                 },
                 'unique' => $index->isUnique(),
             ];
@@ -255,7 +255,8 @@ public function getIndexes($table)
                 $indexList[] = [
                     'name' => $index['name'],
                     'columns' => match ($index['type']) {
-                        'search' => array_keys($index['latestDefinition']['mappings']['fields'] ?? []),
+                        'search' => ($index['latestDefinition']['mappings']['dynamic'] ?? false ? ['dynamic'] : [])
+                            + array_keys($index['latestDefinition']['mappings']['fields'] ?? []),
                         'vectorSearch' => array_column($index['latestDefinition']['fields'], 'path'),
                     },
                     'type' => $index['type'],

diff --git a/tests/AtlasSearchTest.php b/tests/AtlasSearchTest.php
@@ -10,6 +10,7 @@
 
 use function assert;
 use function usleep;
+use function usort;
 
 class AtlasSearchTest extends TestCase
 {
@@ -54,6 +55,10 @@ public function setUp(): void
                 ],
             ]);
 
+            $collection->createSearchIndex([
+                'mappings' => ['dynamic' => true],
+            ], ['name' => 'dynamic_search']);
+
             $collection->createSearchIndex([
                 'fields' => [
                     ['type' => 'vector', 'numDimensions' => 16, 'path' => 'vector16', 'similarity' => 'cosine'],
@@ -91,14 +96,18 @@ public function testGetIndexes()
     {
         $indexes = Schema::getIndexes('books');
 
-        self::assertCount(3, $indexes);
+        self::assertIsArray($indexes);
+        self::assertCount(4, $indexes);
+
+        // Order of indexes is not guaranteed
+        usort($indexes, fn ($a, $b) => $a['name'] <=> $b['name']);
 
         $expected = [
             [
                 'name' => '_id_',
                 'columns' => ['_id'],
                 'primary' => true,
-                'type' => 'default',
+                'type' => null,
                 'unique' => false,
             ],
             [
@@ -108,6 +117,13 @@ public function testGetIndexes()
                 'primary' => false,
                 'unique' => false,
             ],
+            [
+                'name' => 'dynamic_search',
+                'columns' => ['dynamic'],
+                'type' => 'search',
+                'primary' => false,
+                'unique' => false,
+            ],
             [
                 'name' => 'vector',
                 'columns' => ['vector16', 'vector32'],

diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -482,20 +482,41 @@ public function testGetIndexes()
             $collection->string('mykey3')->index();
         });
         $indexes = Schema::getIndexes('newcollection');
-        $this->assertIsArray($indexes);
-        $this->assertCount(4, $indexes);
-
-        $indexes = collect($indexes)->keyBy('name');
-
-        $indexes->each(function ($index) {
-            $this->assertIsString($index['name']);
-            $this->assertIsString($index['type']);
-            $this->assertIsArray($index['columns']);
-            $this->assertIsBool($index['unique']);
-            $this->assertIsBool($index['primary']);
-        });
-        $this->assertTrue($indexes->get('_id_')['primary']);
-        $this->assertTrue($indexes->get('unique_index_1')['unique']);
+        self::assertIsArray($indexes);
+        self::assertCount(4, $indexes);
+
+        $expected = [
+            [
+                'name' => '_id_',
+                'columns' => ['_id'],
+                'primary' => true,
+                'type' => null,
+                'unique' => false,
+            ],
+            [
+                'name' => 'mykey1_1',
+                'columns' => ['mykey1'],
+                'primary' => false,
+                'type' => null,
+                'unique' => false,
+            ],
+            [
+                'name' => 'unique_index_1',
+                'columns' => ['unique_index'],
+                'primary' => false,
+                'type' => null,
+                'unique' => true,
+            ],
+            [
+                'name' => 'mykey3_1',
+                'columns' => ['mykey3'],
+                'primary' => false,
+                'type' => null,
+                'unique' => false,
+            ],
+        ];
+
+        self::assertSame($expected, $indexes);
 
         // Non-existent collection
         $indexes = Schema::getIndexes('missing');