Add custom resolve_model_init_order

Author: aclark4life

django_mongodb/query.py

@@ -360,6 +360,22 @@ def __init__(
     def iterator(self):
         yield from MongoRawModelIterable(self)
 
+    def resolve_model_init_order(self, columns):
+        """Resolve the init field names and value positions."""
+        model_init_fields = [
+            f for f in self.model._meta.fields if f.column in columns
+        ]
+        annotation_fields = [
+            (column, pos)
+            for pos, column in enumerate(columns)
+            if column not in self.model_fields
+        ]
+        model_init_order = [
+            columns.index(f.column) for f in model_init_fields
+        ]
+        model_init_names = [f.attname for f in model_init_fields]
+        return model_init_names, model_init_order, annotation_fields
+
 
 class MongoRawModelIterable(RawModelIterable):
     """
@@ -373,13 +389,16 @@ def __iter__(self):
         connection = connections[db]
         compiler = connection.ops.compiler("SQLCompiler")(query, connection, db)
         query_iterator = self._make_result(query)
+        # FIXME Get columns from first row of the query without iterating over
+        # the query.
+        columns = self.queryset.columns
 
         try:
             (
                 model_init_names,
                 model_init_pos,
                 annotation_fields,
-            ) = self.queryset.resolve_model_init_order()
+            ) = self.queryset.resolve_model_init_order(columns)
             model_cls = self.queryset.model
             if model_cls._meta.pk.attname not in model_init_names:
                 raise FieldDoesNotExist(