re-create the cursor object whenever we apply read_preference
This commit is contained in:
parent
6868f66f24
commit
a7aead5138
@ -7,6 +7,7 @@ Changes in 0.10.2
|
|||||||
- Allow shard key to point to a field in an embedded document. #551
|
- Allow shard key to point to a field in an embedded document. #551
|
||||||
- Allow arbirary metadata in fields. #1129
|
- Allow arbirary metadata in fields. #1129
|
||||||
- ReferenceFields now support abstract document types. #837
|
- ReferenceFields now support abstract document types. #837
|
||||||
|
- Fix `read_preference` (it had chaining issues with PyMongo 2.x and it didn't work at all with PyMongo 3.x) #1042
|
||||||
|
|
||||||
Changes in 0.10.1
|
Changes in 0.10.1
|
||||||
=======================
|
=======================
|
||||||
|
@ -930,6 +930,7 @@ class BaseQuerySet(object):
|
|||||||
validate_read_preference('read_preference', read_preference)
|
validate_read_preference('read_preference', read_preference)
|
||||||
queryset = self.clone()
|
queryset = self.clone()
|
||||||
queryset._read_preference = read_preference
|
queryset._read_preference = read_preference
|
||||||
|
queryset._cursor_obj = None # we need to re-create the cursor object whenever we apply read_preference
|
||||||
return queryset
|
return queryset
|
||||||
|
|
||||||
def scalar(self, *fields):
|
def scalar(self, *fields):
|
||||||
|
@ -4165,7 +4165,11 @@ class QuerySetTest(unittest.TestCase):
|
|||||||
|
|
||||||
def test_read_preference(self):
|
def test_read_preference(self):
|
||||||
class Bar(Document):
|
class Bar(Document):
|
||||||
pass
|
txt = StringField()
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
'indexes': [ 'txt' ]
|
||||||
|
}
|
||||||
|
|
||||||
Bar.drop_collection()
|
Bar.drop_collection()
|
||||||
bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
|
bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
|
||||||
@ -4177,9 +4181,51 @@ class QuerySetTest(unittest.TestCase):
|
|||||||
error_class = TypeError
|
error_class = TypeError
|
||||||
self.assertRaises(error_class, Bar.objects, read_preference='Primary')
|
self.assertRaises(error_class, Bar.objects, read_preference='Primary')
|
||||||
|
|
||||||
|
# read_preference as a kwarg
|
||||||
bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
|
bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
|
bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(bars._cursor._Cursor__read_preference,
|
||||||
|
ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
|
||||||
|
# read_preference as a query set method
|
||||||
|
bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(
|
||||||
|
bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(bars._cursor._Cursor__read_preference,
|
||||||
|
ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
|
||||||
|
# read_preference after skip
|
||||||
|
bars = Bar.objects.skip(1) \
|
||||||
|
.read_preference(ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(
|
||||||
|
bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(bars._cursor._Cursor__read_preference,
|
||||||
|
ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
|
||||||
|
# read_preference after limit
|
||||||
|
bars = Bar.objects.limit(1) \
|
||||||
|
.read_preference(ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(
|
||||||
|
bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(bars._cursor._Cursor__read_preference,
|
||||||
|
ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
|
||||||
|
# read_preference after order_by
|
||||||
|
bars = Bar.objects.order_by('txt') \
|
||||||
|
.read_preference(ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(
|
||||||
|
bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(bars._cursor._Cursor__read_preference,
|
||||||
|
ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
|
||||||
|
# read_preference after hint
|
||||||
|
bars = Bar.objects.hint([('txt', 1)]) \
|
||||||
|
.read_preference(ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(
|
||||||
|
bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
self.assertEqual(bars._cursor._Cursor__read_preference,
|
||||||
|
ReadPreference.SECONDARY_PREFERRED)
|
||||||
|
|
||||||
def test_json_simple(self):
|
def test_json_simple(self):
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user