edits

Author: timgraham

.github/workflows/test-python-atlas.yml

@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'mongodb-forks/django'
-          ref: 'mongodb-5.1.x'
+          ref: 'mongodb-5.2.x'
           path: 'django_repo'
           persist-credentials: false
       - name: Install system packages for Django's Python test dependencies

tests/indexes_/models.py

@@ -15,12 +15,13 @@ class Data(EmbeddedModel):
 
 
 class SearchIndexTestModel(models.Model):
-    text = models.CharField(max_length=100)
-    object_id = ObjectIdField()
-    number = models.IntegerField()
+    boolean = models.BooleanField()
+    date = models.DateTimeField(auto_now=True)
     embedded = EmbeddedModelField(Data)
+    float = models.FloatField()
     json_data = models.JSONField()
-    vector_integer = ArrayField(models.IntegerField(), size=10)
+    number = models.IntegerField()
+    object_id = ObjectIdField()
+    text = models.CharField(max_length=100)
     vector_float = ArrayField(models.FloatField(), size=10)
-    boolean = models.BooleanField()
-    date = models.DateTimeField(auto_now=True)
+    vector_integer = ArrayField(models.IntegerField(), size=10)

tests/indexes_/test_search_indexes.py

@@ -1,13 +1,15 @@
+from unittest import mock
+
 from django.db import connection
-from django.test import SimpleTestCase, TestCase, skipIfDBFeature, skipUnlessDBFeature
+from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
 
 from django_mongodb_backend.indexes import SearchIndex, VectorSearchIndex
 
 from .models import SearchIndexTestModel
 from .test_base import SchemaAssertionMixin
 
 
-@skipIfDBFeature("supports_atlas_search")
+@mock.patch.object(connection.features, "supports_atlas_search", False)
 class UnsupportedSearchIndexesTests(TestCase):
     def test_search_index_not_created(self):
         with connection.schema_editor() as editor:
@@ -37,7 +39,7 @@ def test_vector_index_not_created(self):
 
 
 class VectorSearchIndexTests(SimpleTestCase):
-    def test_deconstruct_default_similarity(self):
+    def test_deconstruct(self):
         index = VectorSearchIndex(name="recent_test_idx", fields=["number"])
         name, args, kwargs = index.deconstruct()
         new = VectorSearchIndex(*args, **kwargs)
@@ -87,21 +89,23 @@ def test_simple(self):
             name="recent_test_idx",
             fields=["text"],
         )
-        self.assertAddRemoveIndex(index=index, model=SearchIndexTestModel)
+        with connection.schema_editor() as editor:
+            self.assertAddRemoveIndex(editor, index=index, model=SearchIndexTestModel)
 
     def test_all_fields(self):
         index = SearchIndex(
             name="recent_test_idx",
             fields=[
-                "text",
-                "object_id",
-                "number",
+                "boolean",
+                "date",
                 "embedded",
+                "float",
                 "json_data",
+                "number",
+                "object_id",
+                "text",
                 "vector_integer",
                 "vector_float",
-                "boolean",
-                "date",
             ],
         )
         with connection.schema_editor() as editor:
@@ -115,7 +119,14 @@ def test_all_fields(self):
                 "dynamic": False,
                 "fields": {
                     "boolean": {"type": "boolean"},
+                    "date": {"type": "date"},
                     "embedded": {"dynamic": False, "fields": {}, "type": "embeddedDocuments"},
+                    "float": {
+                        "indexDoubles": True,
+                        "indexIntegers": True,
+                        "representation": "double",
+                        "type": "number",
+                    },
                     "json_data": {"dynamic": False, "fields": {}, "type": "document"},
                     "number": {
                         "indexDoubles": True,
@@ -130,7 +141,6 @@ def test_all_fields(self):
                         "store": True,
                         "type": "string",
                     },
-                    "date": {"type": "date"},
                     "vector_float": {"dynamic": False, "fields": {}, "type": "embeddedDocuments"},
                     "vector_integer": {"dynamic": False, "fields": {}, "type": "embeddedDocuments"},
                 },
@@ -144,9 +154,10 @@ def test_all_fields(self):
 
 @skipUnlessDBFeature("supports_atlas_search")
 class VectorSearchIndexSchemaTests(SchemaAssertionMixin, TestCase):
-    def test_simple_vector_search(self):
+    def test_simple(self):
         index = VectorSearchIndex(name="recent_test_idx", fields=["number"])
-        self.assertAddRemoveIndex(index=index, model=SearchIndexTestModel)
+        with connection.schema_editor() as editor:
+            self.assertAddRemoveIndex(editor, index=index, model=SearchIndexTestModel)
 
     def test_multiple_fields(self):
         index = VectorSearchIndex(