INTPYTHON-348 add support for QuerySet.raw_mql()

Author: aclark4life

django_mongodb/query.py

@@ -325,56 +325,28 @@ def __init__(self, sql, using, model, params=()):
         self.using = using
         self.cursor = None
         self.model = model
-
-        # Mirror some properties of a normal query so that
-        # the compiler can be used to process results.
         self.low_mark, self.high_mark = 0, None  # Used for offset/limit
         self.extra_select = {}
         self.annotation_select = {}
 
     def __iter__(self):
-        # Always execute a new query for a new iterator.
-        # This could be optimized with a cache at the expense of RAM.
-
         self.cursor = self._execute_query()
-
         if not connections[self.using].features.can_use_chunked_reads:
-            # If the database can't use chunked reads we need to make sure we
-            # evaluate the entire query up front.
             result = list(self.cursor)
         else:
             result = self.cursor
-
         return iter(result)
 
     def _execute_query(self):
         connection = connections[self.using]
-        # params_type = self.params_type
-        # adapter = connection.ops.adapt_unknown_value
-
-        # if params_type is tuple:
-        #     params = tuple(adapter(val) for val in self.params)
-        # elif params_type is dict:
-        #     params = {key: adapter(val) for key, val in self.params.items()}
-        # elif params_type is None:
-        #     params = None
-        # else:
-        #     raise RuntimeError("Unexpected params type: %s" % params_type)
-
-        # self.cursor = connection.cursor()
-        # self.cursor.execute(self.sql, params)
-
         collection = connection.get_collection(self.model._meta.db_table)
-
         return collection.aggregate(self.sql)
 
     def get_columns(self):
         if self.cursor is None:
             self._execute_query()
         converter = connections[self.using].introspection.identifier_converter
-        # self.cursor.description = ""
-        # return [converter(column_meta[0]) for column_meta in self.cursor.description]
-        return [converter(column_name) for column_name in self.model._meta.get_fields()]
+        return [converter(column_name) for column_name in self.model._meta.fields]
 
 
 class MongoRawQuerySet(RawQuerySet):
@@ -396,3 +368,17 @@ def __init__(
         )
         self._result_cache = None
         self.translations = translations or {}
+
+    def resolve_model_init_order(self):
+        converter = connections[self.db].introspection.identifier_converter
+        model_init_fields = [
+            f for f in self.model._meta.fields if f.column in [j.column for j in self.columns]
+        ]
+        annotation_fields = [
+            (column, pos)
+            for pos, column in enumerate(self.columns)
+            if column not in self.model_fields
+        ]
+        model_init_order = [self.columns.index(converter(f)) 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