INTPYTHON-348 aggregate via raw_mql

Author: aclark4life

django_mongodb/manager.py

@@ -3,5 +3,6 @@
 
 
 class MongoManager(BaseManager.from_queryset(MongoQuerySet)):
-    def get_queryset(self):
-        return MongoQuerySet(self.model, using=self._db)
+    pass
+    # def get_queryset(self):
+    #     return MongoQuerySet(self.model, using=self._db)

django_mongodb/query.py

@@ -8,11 +8,11 @@
 from django.db.models.expressions import Case, Col, When
 from django.db.models.functions import Mod
 from django.db.models.lookups import Exact
-from django.db.models.query import BaseIterable
+from django.db.models.query import BaseIterable, RawQuerySet
 from django.db.models.sql.constants import INNER, GET_ITERATOR_CHUNK_SIZE
 from django.db.models.sql.datastructures import Join
 from django.db.models.sql.where import AND, OR, XOR, ExtraWhere, NothingNode, WhereNode
-from django.db.models.sql import Query
+from django.db.models.sql import Query, RawQuery
 from django.utils.functional import cached_property
 from pymongo.errors import BulkWriteError, DuplicateKeyError, PyMongoError
 
@@ -311,11 +311,16 @@ def register_nodes():
 
 class MongoQuerySet(QuerySet):
     def raw_mql(self, raw_query, params=(), translations=None, using=None):
-        return QuerySet(self.model, RawQuery(self.model, raw_query))
-
-
-class RawQuery(Query):
-
-    def __init__(self, model, raw_query):
-        super(RawQuery, self).__init__(model)
-        self.raw_query = raw_query
+        return MongoRawQuerySet(     
+            raw_query,                                           
+            model=self.model,                                    
+            params=params,                                         
+            translations=translations,                                      
+            using=using,                                     
+        )                    
+
+class MongoRawQuery(RawQuery):
+    pass
+
+class MongoRawQuerySet(RawQuerySet):
+    pass