Skip to content

propagate collation, hint, comment to PyMongo functions #2843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2024
Merged

propagate collation, hint, comment to PyMongo functions #2843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions mongoengine/queryset/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,8 +519,20 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
write_concern=write_concern, **{"pull_all__%s" % field_name: self}
)

kwargs = {}
if self._hint not in (-1, None):
kwargs["hint"] = self._hint
if self._collation:
kwargs["collation"] = self._collation
if self._comment:
kwargs["comment"] = self._comment

with set_write_concern(queryset._collection, write_concern) as collection:
result = collection.delete_many(queryset._query, session=_get_session())
result = collection.delete_many(
queryset._query,
session=_get_session(),
**kwargs,
)

# If we're using an unack'd write concern, we don't really know how
# many items have been deleted at this point, hence we only return
Expand Down Expand Up @@ -582,6 +594,15 @@ def update(
update["$set"]["_cls"] = queryset._document._class_name
else:
update["$set"] = {"_cls": queryset._document._class_name}

kwargs = {}
if self._hint not in (-1, None):
kwargs["hint"] = self._hint
if self._collation:
kwargs["collation"] = self._collation
if self._comment:
kwargs["comment"] = self._comment

try:
with set_read_write_concern(
queryset._collection, write_concern, read_concern
Expand All @@ -595,6 +616,7 @@ def update(
upsert=upsert,
array_filters=array_filters,
session=_get_session(),
**kwargs,
)
if full_result:
return result
Expand Down Expand Up @@ -1388,8 +1410,18 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
read_preference=self._read_preference, read_concern=self._read_concern
)

if self._hint not in (-1, None):
kwargs.setdefault("hint", self._hint)
if self._collation:
kwargs.setdefault("collation", self._collation)
if self._comment:
kwargs.setdefault("comment", self._comment)

return collection.aggregate(
final_pipeline, cursor={}, session=_get_session(), **kwargs
final_pipeline,
cursor={},
session=_get_session(),
**kwargs,
)

# JS functionality
Expand Down