Skip to content

Commit 4929c30

Browse files
committed
Rename query variable
1 parent f4d7ddd commit 4929c30

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

django_mongodb_backend/fields/array.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,24 +310,24 @@ class ArrayOverlap(ArrayRHSMixin, FieldGetDbPrepValueMixin, Lookup):
310310

311311
def get_subquery_wrapping_pipeline(self, compiler, connection, field_name, expr):
312312
return [
313-
{"$project": {"tmp_name": expr.as_mql(compiler, connection, as_expr=True)}},
313+
{"$project": {"subquery_results": expr.as_mql(compiler, connection, as_expr=True)}},
314314
{
315-
"$unwind": "$tmp_name",
315+
"$unwind": "$subquery_results",
316316
},
317317
{
318318
"$group": {
319319
"_id": None,
320-
"tmp_name": {"$addToSet": "$tmp_name"},
320+
"subquery_results": {"$addToSet": "$subquery_results"},
321321
}
322322
},
323323
# Workaround for https://jira.mongodb.org/browse/SERVER-114196:
324324
# $$NOW becomes unavailable after $unionWith, so it must be stored
325325
# beforehand to ensure it remains accessible later in the pipeline.
326326
{"$addFields": {"__now": "$$NOW"}},
327327
# Add an empty extra document to handle default values on empty results.
328-
{"$unionWith": {"pipeline": [{"$documents": [{"tmp_name": []}]}]}},
328+
{"$unionWith": {"pipeline": [{"$documents": [{"subquery_results": []}]}]}},
329329
{"$limit": 1},
330-
{"$project": {field_name: "$tmp_name"}},
330+
{"$project": {field_name: "$subquery_results"}},
331331
]
332332

333333
def as_mql_expr(self, compiler, connection):

django_mongodb_backend/fields/embedded_model_array.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ def get_subquery_wrapping_pipeline(self, compiler, connection, field_name, expr)
150150
# structure of EmbeddedModelArrayField on the RHS behaves similar to
151151
# ArrayField.
152152
return [
153-
{"$project": {"tmp_name": expr.as_mql(compiler, connection, as_expr=True)}},
153+
{"$project": {"subquery_results": expr.as_mql(compiler, connection, as_expr=True)}},
154154
# To concatenate all the values from the RHS subquery,
155155
# use an $unwind followed by a $group.
156156
{
157-
"$unwind": "$tmp_name",
157+
"$unwind": "$subquery_results",
158158
},
159159
# The $group stage collects values into an array using
160160
# $addToSet. The use of {_id: null} results in a
@@ -164,17 +164,17 @@ def get_subquery_wrapping_pipeline(self, compiler, connection, field_name, expr)
164164
{
165165
"$group": {
166166
"_id": None,
167-
"tmp_name": {"$addToSet": "$tmp_name"},
167+
"subquery_results": {"$addToSet": "$subquery_results"},
168168
}
169169
},
170170
# Workaround for https://jira.mongodb.org/browse/SERVER-114196:
171171
# $$NOW becomes unavailable after $unionWith, so it must be stored
172172
# beforehand to ensure it remains accessible later in the pipeline.
173173
{"$addFields": {"__now": "$$NOW"}},
174174
# Add a dummy document in case of empty result.
175-
{"$unionWith": {"pipeline": [{"$documents": [{"tmp_name": []}]}]}},
175+
{"$unionWith": {"pipeline": [{"$documents": [{"subquery_results": []}]}]}},
176176
{"$limit": 1},
177-
{"$project": {field_name: "$tmp_name"}},
177+
{"$project": {field_name: "$subquery_results"}},
178178
]
179179

180180

tests/lookup_/tests.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,15 @@ def test_subquery_filter_constant(self):
137137
"let": {},
138138
"pipeline": [
139139
{"$match": {"num": {"$gt": 2}}},
140-
{"$group": {"_id": None, "tmp_name": {"$addToSet": "$num"}}},
140+
{"$group": {"_id": None, "subquery_results": {"$addToSet": "$num"}}},
141141
{"$addFields": {"__now": "$$NOW"}},
142-
{"$unionWith": {"pipeline": [{"$documents": [{"tmp_name": []}]}]}},
142+
{
143+
"$unionWith": {
144+
"pipeline": [{"$documents": [{"subquery_results": []}]}]
145+
}
146+
},
143147
{"$limit": 1},
144-
{"$project": {"num": "$tmp_name"}},
148+
{"$project": {"num": "$subquery_results"}},
145149
],
146150
}
147151
},

0 commit comments

Comments
 (0)