Add _read_concern to copied properties. Add read_concern to aggregate. Add test to check the read_concern and read_preference values are kept after cloning.
This commit is contained in:
parent
4275c2d7b7
commit
1698f398eb
@ -789,6 +789,7 @@ class BaseQuerySet:
|
|||||||
"_snapshot",
|
"_snapshot",
|
||||||
"_timeout",
|
"_timeout",
|
||||||
"_read_preference",
|
"_read_preference",
|
||||||
|
"_read_concern",
|
||||||
"_iter",
|
"_iter",
|
||||||
"_scalar",
|
"_scalar",
|
||||||
"_as_pymongo",
|
"_as_pymongo",
|
||||||
@ -1311,10 +1312,11 @@ class BaseQuerySet:
|
|||||||
final_pipeline = initial_pipeline + user_pipeline
|
final_pipeline = initial_pipeline + user_pipeline
|
||||||
|
|
||||||
collection = self._collection
|
collection = self._collection
|
||||||
if self._read_preference is not None:
|
if self._read_preference is not None or self._read_concern is not None:
|
||||||
collection = self._collection.with_options(
|
collection = self._collection.with_options(
|
||||||
read_preference=self._read_preference
|
read_preference=self._read_preference, read_concern=self._read_concern
|
||||||
)
|
)
|
||||||
|
|
||||||
return collection.aggregate(final_pipeline, cursor={}, **kwargs)
|
return collection.aggregate(final_pipeline, cursor={}, **kwargs)
|
||||||
|
|
||||||
# JS functionality
|
# JS functionality
|
||||||
|
@ -4021,6 +4021,32 @@ class TestQueryset(unittest.TestCase):
|
|||||||
|
|
||||||
Number.drop_collection()
|
Number.drop_collection()
|
||||||
|
|
||||||
|
def test_clone_retains_settings(self):
|
||||||
|
"""Ensure that cloning retains the read_preference and read_concern
|
||||||
|
"""
|
||||||
|
|
||||||
|
class Number(Document):
|
||||||
|
n = IntField()
|
||||||
|
|
||||||
|
Number.drop_collection()
|
||||||
|
|
||||||
|
qs = Number.objects
|
||||||
|
qs_clone = qs.clone()
|
||||||
|
assert qs._read_preference == qs_clone._read_preference
|
||||||
|
assert qs._read_concern == qs_clone._read_concern
|
||||||
|
|
||||||
|
qs = Number.objects.read_preference(ReadPreference.PRIMARY_PREFERRED)
|
||||||
|
qs_clone = qs.clone()
|
||||||
|
assert qs._read_preference == ReadPreference.PRIMARY_PREFERRED
|
||||||
|
assert qs._read_preference == qs_clone._read_preference
|
||||||
|
|
||||||
|
qs = Number.objects.read_concern({'level': 'majority'})
|
||||||
|
qs_clone = qs.clone()
|
||||||
|
assert qs._read_concern.document == {'level': 'majority'}
|
||||||
|
assert qs._read_concern == qs_clone._read_concern
|
||||||
|
|
||||||
|
Number.drop_collection()
|
||||||
|
|
||||||
def test_using(self):
|
def test_using(self):
|
||||||
"""Ensure that switching databases for a queryset is possible
|
"""Ensure that switching databases for a queryset is possible
|
||||||
"""
|
"""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user