Skip to content

Commit 7b3fb24

Browse files
committed
Initial commit.
1 parent c05c3a2 commit 7b3fb24

File tree

4 files changed

+100
-28
lines changed

4 files changed

+100
-28
lines changed

django_mongodb/compiler.py

Lines changed: 72 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ def check_query(self):
114114
isinstance(a, Aggregate) and not isinstance(a, Count)
115115
for a in self.query.annotations.values()
116116
):
117-
raise NotSupportedError("QuerySet.aggregate() isn't supported on MongoDB.")
117+
# raise NotSupportedError("QuerySet.aggregate() isn't supported on MongoDB.")
118+
pass
118119

119120
def get_count(self, check_exists=False):
120121
"""
@@ -141,8 +142,10 @@ def get_count(self, check_exists=False):
141142
def build_query(self, columns=None):
142143
"""Check if the query is supported and prepare a MongoQuery."""
143144
self.check_query()
144-
query = self.query_class(self, columns)
145+
query = self.query_class(self)
146+
query.project_fields = self._get_project_fields(columns)
145147
query.lookup_pipeline = self.get_lookup_pipeline()
148+
query.annotation_stage = self._get_group_pipeline()
146149
try:
147150
query.mongo_query = {"$expr": self.query.where.as_mql(self, self.connection)}
148151
except FullResultSet:
@@ -247,6 +250,73 @@ def get_lookup_pipeline(self):
247250
result += self.query.alias_map[alias].as_mql(self, self.connection)
248251
return result
249252

253+
def _get_group_pipeline(self):
254+
pipeline = None
255+
if any(isinstance(a, Aggregate) for a in self.query.annotations.values()):
256+
result = {}
257+
# self.get_group_by(self.select, [])
258+
for alias, annotation in self.query.annotation_select.items():
259+
value = annotation.as_mql(self, self.connection)
260+
if isinstance(value, list):
261+
value = value[0]
262+
result[alias] = value
263+
264+
expressions = set()
265+
for expr, *_ in self.select:
266+
expressions |= set(expr.get_group_by_cols())
267+
order_by = self.get_order_by()
268+
for expr, (_, _, is_ref) in order_by:
269+
# Skip references to the SELECT clause, as all expressions in
270+
# the SELECT clause are already part of the GROUP BY.
271+
if not is_ref:
272+
expressions |= set(expr.get_group_by_cols())
273+
having_group_by = self.having.get_group_by_cols() if self.having else ()
274+
for expr in having_group_by:
275+
expressions.add(expr)
276+
277+
ids = (
278+
None
279+
if not expressions
280+
else {col.target.column: col.as_mql(self, self.connection) for col in expressions}
281+
)
282+
result["_id"] = ids
283+
284+
pipeline = [{"$group": result}]
285+
if ids:
286+
pipeline.append(
287+
{"$addFields": {key: f"$_id.{value[1:]}" for key, value in ids.items()}}
288+
)
289+
if "_id" not in ids:
290+
pipeline.append({"$unSet": "$_id"})
291+
292+
return pipeline
293+
294+
def _get_project_fields(self, columns=None):
295+
fields = {}
296+
for name, expr in columns or []:
297+
try:
298+
column = name if isinstance(expr, Aggregate) else expr.target.column
299+
except AttributeError:
300+
# Generate the MQL for an annotation.
301+
try:
302+
fields[name] = expr.as_mql(self, self.connection)
303+
except EmptyResultSet:
304+
fields[name] = Value(False).as_mql(self, self.connection)
305+
except FullResultSet:
306+
fields[name] = Value(True).as_mql(self, self.connection)
307+
else:
308+
# If name != column, then this is an annotatation referencing
309+
# another column.
310+
fields[name] = 1 if name == column else f"${column}"
311+
312+
if fields:
313+
# Add related fields.
314+
for alias in self.query.alias_map:
315+
if self.query.alias_refcount[alias] and self.collection_name != alias:
316+
fields[alias] = 1
317+
318+
return fields
319+
250320

251321
class SQLInsertCompiler(SQLCompiler):
252322
def execute_sql(self, returning_fields=None):

django_mongodb/functions.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from django.db import NotSupportedError
2+
from django.db.models.aggregates import Aggregate, Avg, Count, Max, Min, StdDev, Sum, Variance
23
from django.db.models.expressions import Func
34
from django.db.models.functions.comparison import Cast, Coalesce, Greatest, Least, NullIf
45
from django.db.models.functions.datetime import (
@@ -33,6 +34,17 @@
3334

3435
from .query_utils import process_lhs
3536

37+
MONGO_AGGREGATION = {
38+
Avg: "avg",
39+
Count: "sum",
40+
Max: "max",
41+
Min: "min",
42+
StdDev: "stddev",
43+
Sum: "sum",
44+
Variance: "variance",
45+
}
46+
47+
3648
MONGO_OPERATORS = {
3749
Ceil: "ceil",
3850
Coalesce: "ifNull",
@@ -57,6 +69,10 @@
5769
}
5870

5971

72+
def aggregate(self, compiler, connection): # noqa: ARG001
73+
pass
74+
75+
6076
def cast(self, compiler, connection):
6177
output_type = connection.data_types[self.output_field.get_internal_type()]
6278
lhs_mql = process_lhs(self, compiler, connection)[0]
@@ -187,6 +203,7 @@ def trunc(self, compiler, connection):
187203

188204

189205
def register_functions():
206+
Aggregate.as_mql = aggregate
190207
Cast.as_mql = cast
191208
Concat.as_mql = concat
192209
ConcatPair.as_mql = concat_pair

django_mongodb/query.py

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from django.core.exceptions import EmptyResultSet, FullResultSet
55
from django.db import DatabaseError, IntegrityError
6-
from django.db.models.expressions import Case, Value, When
6+
from django.db.models.expressions import Case, When
77
from django.db.models.functions import Mod
88
from django.db.models.lookups import Exact
99
from django.db.models.sql.constants import INNER
@@ -37,18 +37,19 @@ class MongoQuery:
3737
built by Django to a "representation" more suitable for MongoDB.
3838
"""
3939

40-
def __init__(self, compiler, columns):
40+
def __init__(self, compiler):
4141
self.compiler = compiler
4242
self.connection = compiler.connection
4343
self.ops = compiler.connection.ops
4444
self.query = compiler.query
45-
self.columns = columns
4645
self._negated = False
4746
self.ordering = []
4847
self.collection = self.compiler.get_collection()
4948
self.collection_name = self.compiler.collection_name
5049
self.mongo_query = getattr(compiler.query, "raw_query", {})
5150
self.lookup_pipeline = None
51+
self.annotation_stage = None
52+
self.project_fields = None
5253

5354
def __repr__(self):
5455
return f"<MongoQuery: {self.mongo_query!r} ORDER {self.ordering!r}>"
@@ -103,35 +104,16 @@ def get_cursor(self, count=False, limit=None, skip=None):
103104
"""
104105
if self.query.low_mark == self.query.high_mark:
105106
return []
106-
fields = {}
107-
for name, expr in self.columns or []:
108-
try:
109-
column = expr.target.column
110-
except AttributeError:
111-
# Generate the MQL for an annotation.
112-
try:
113-
fields[name] = expr.as_mql(self.compiler, self.connection)
114-
except EmptyResultSet:
115-
fields[name] = Value(False).as_mql(self.compiler, self.connection)
116-
except FullResultSet:
117-
fields[name] = Value(True).as_mql(self.compiler, self.connection)
118-
else:
119-
# If name != column, then this is an annotatation referencing
120-
# another column.
121-
fields[name] = 1 if name == column else f"${column}"
122-
if fields:
123-
# Add related fields.
124-
for alias in self.query.alias_map:
125-
if self.query.alias_refcount[alias] and self.collection_name != alias:
126-
fields[alias] = 1
127107
# Construct the query pipeline.
128108
pipeline = []
129109
if self.lookup_pipeline:
130110
pipeline.extend(self.lookup_pipeline)
131111
if self.mongo_query:
132112
pipeline.append({"$match": self.mongo_query})
133-
if fields:
134-
pipeline.append({"$project": fields})
113+
if self.annotation_stage:
114+
pipeline.extend(self.annotation_stage)
115+
if self.project_fields:
116+
pipeline.append({"$project": self.project_fields})
135117
if self.ordering:
136118
pipeline.append({"$sort": dict(self.ordering)})
137119
if skip is not None:

django_mongodb/query_utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from django.core.exceptions import FullResultSet
2+
from django.db.models.aggregates import Aggregate
23
from django.db.models.expressions import Value
34

45

@@ -15,6 +16,8 @@ def process_lhs(node, compiler, connection):
1516
result.append(expr.as_mql(compiler, connection))
1617
except FullResultSet:
1718
result.append(Value(True).as_mql(compiler, connection))
19+
if isinstance(node, Aggregate):
20+
return result[0]
1821
return result
1922
# node is a Transform with just one source expression, aliased as "lhs".
2023
if is_direct_value(node.lhs):

0 commit comments

Comments
 (0)