fix: Do not drop/re-create 2dsphere indexes (#2575)

doctrine · Nov 6, 2023 · d6f1686 · d6f1686
1 parent fa10f36
commit d6f1686
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/SchemaManager.php b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
@@ -52,6 +52,7 @@ final class SchemaManager
         'language_override',
         'textIndexVersion',
         'name',
+        '2dsphereIndexVersion',
     ];
 
     protected DocumentManager $dm;

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/IndexesTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/IndexesTest.php
@@ -239,6 +239,16 @@ public function testPartialIndexCreation(): void
         self::assertSame(['counter' => ['$gt' => 5]], $indexes[0]['options']['partialFilterExpression']);
         self::assertTrue($indexes[0]['options']['unique']);
     }
+
+    public function testGeoIndexCreation(): void
+    {
+        $className = GeoIndexDocument::class;
+        $this->dm->getSchemaManager()->ensureDocumentIndexes(GeoIndexDocument::class);
+
+        $indexes = $this->dm->getSchemaManager()->getDocumentIndexes($className);
+        self::assertSame(['coordinatesWith2DIndex' => '2d'], $indexes[0]['keys']);
+        self::assertSame(['coordinatesWithSphereIndex' => '2dsphere'], $indexes[1]['keys']);
+    }
 }
 
 /** @ODM\Document */
@@ -657,3 +667,32 @@ class DocumentWithIndexInDiscriminatedEmbeds
      */
     public $embedded;
 }
+
+/**
+ * @ODM\Document
+ * @ODM\Index(keys={"coordinatesWith2DIndex"="2d"})
+ * @ODM\Index(keys={"coordinatesWithSphereIndex"="2dsphere"})
+ */
+class GeoIndexDocument
+{
+    /**
+     * @ODM\Id
+     *
+     * @var string|null
+     */
+    public $id;
+
+    /**
+     * @ODM\Field(type="hash")
+     *
+     * @var array<float>
+     */
+    public $coordinatesWith2DIndex;
+
+    /**
+     * @ODM\Field(type="hash")
+     *
+     * @var array<float>
+     */
+    public $coordinatesWithSphereIndex;
+}
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php b/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php
@@ -997,6 +997,12 @@ public static function dataIsMongoIndexEquivalentToDocumentIndex(): array
                 'mongoIndex' => ['background' => true],
                 'documentIndex' => ['options' => ['background' => true]],
             ],
+            // 2dsphereIndexVersion index options
+            '2dsphereIndexVersionOptionsDifferent' => [
+                'expected' => true,
+                'mongoIndex' => ['2dsphereIndexVersion' => 3],
+                'documentIndex' => [],
+            ],
         ];
     }