edits

Author: timgraham

django_mongodb_backend/queryset.py

@@ -93,4 +93,4 @@ def _make_result(self, query):
         of __iter__().
         """
         for result in query:
-            yield tuple(result.get(key, None) for key in self.queryset.columns)
+            yield tuple(result.get(key) for key in self.queryset.columns)

docs/source/releases/5.1.x.rst

@@ -8,6 +8,8 @@ Django MongoDB Backend 5.1.x
 *Unreleased*
 
 - Added support for :doc:`database caching </topics/cache>`.
+- Fixed ``QuerySet.raw_aggregate()`` field initialization when the document key
+  order doesn't match the order of the model's fields.
 
 5.1.0 beta 1
 ============

tests/raw_query_/test_raw_aggregate.py

@@ -2,10 +2,10 @@
 These tests are adapted from Django's tests/raw_query/tests.py.
 """
 
-from datetime import date
+from datetime import date, datetime
 
-from django.db import connection
 from django.core.exceptions import FieldDoesNotExist
+from django.db import connection
 from django.test import TestCase
 
 from django_mongodb_backend.queryset import RawQuerySet
@@ -171,29 +171,23 @@ def test_order_handler(self):
             authors = Author.objects.all()
             self.assertSuccessfulRawQuery(Author, query, authors)
 
-    def test_different_ordered_in_database(self):
-        """Documents in MongoDB are not required to maintain key order as
-        a means to improve write efficiency. Documents can be returned
-        to Django out of order. This can lead to incorrect information being placed
-        in a RawQueryset object.
+    def test_different_db_key_order(self):
         """
-        database = connection["<TEST_DATABASE>"].database
-        raw_insert = Author(first_name="Out of", last_name="Order", dob=date(1950, 9, 20))
-        try:
-            # Insert a document into the database in reverse
-            database[Author._meta.db_table].insert_one(
-                {
-                    field.name: getattr(field.name, raw_insert)
-                    for field in reversed(Author._meta.get_fields())
-                }
-            )
-            query = []
-            authors = Author.objects.all()
-            self.assertSuccessfulRawQuery(Author, query, authors)
-        finally:
-            database[Author._meta.db_table].delete_one(
-                {"first_name": raw_insert.first_name, "last_name": raw_insert.last_name}
-            )
+        A raw query correctly associates document keys to model fields when the
+        document key order is different than the order of model fields.
+        """
+        db = connection.database
+        author = Author(first_name="Out of", last_name="Order", dob=datetime(1950, 9, 20))
+        # Insert a document with the keys reversd.
+        db.get_collection(Author._meta.db_table).insert_one(
+            {
+                field.name: getattr(author, field.name)
+                for field in reversed(Author._meta.concrete_fields)
+            }
+        )
+        query = []
+        authors = Author.objects.all()
+        self.assertSuccessfulRawQuery(Author, query, authors)
 
     def test_query_representation(self):
         """Test representation of raw query."""