pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first adaptations after comments and find-outs

Browse Source
This commit is contained in:
mrigal 2015-04-09 10:57:19 +02:00 committed by Matthieu Rigal
parent 46817caa68
commit ccbd128fa2
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mongoengine/connection.py
View File

@ -8,8 +8,9 @@ __all__ = ['ConnectionError', 'connect', 'register_connection',
DEFAULT_CONNECTION_NAME = 'default' DEFAULT_CONNECTION_NAME = 'default'
if pymongo.version_tuple[0] >= 3: if pymongo.version_tuple[0] >= 3:
READ_PREFERENCE = ReadPreference.SECONDARY_PREFERRED READ_PREFERENCE = ReadPreference.PRIMARY
else: else:
from pymongo import MongoReplicaSetClient
READ_PREFERENCE = False READ_PREFERENCE = False
@ -126,6 +127,8 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
if conn_settings == connection_settings and _connections.get(db_alias, None): if conn_settings == connection_settings and _connections.get(db_alias, None):
connection = _connections[db_alias] connection = _connections[db_alias]
break break
if pymongo.version_tuple[0] < 3:
connection_class = MongoReplicaSetClient
_connections[alias] = connection if connection else connection_class(**conn_settings) _connections[alias] = connection if connection else connection_class(**conn_settings)
except Exception, e: except Exception, e:

8
mongoengine/document.py
View File

@ -295,10 +295,10 @@ class Document(BaseDocument):
# I think the self._created flag is not necessarily required in PyMongo3 # I think the self._created flag is not necessarily required in PyMongo3
# but may cause test test_collection_name_and_primary to fail # but may cause test test_collection_name_and_primary to fail
if pymongo.version_tuple[0] < 3: # if pymongo.version_tuple[0] < 3:
created = ('_id' not in doc or self._created or force_insert) created = ('_id' not in doc or self._created or force_insert)
else: # else:
created = ('_id' not in doc or force_insert) # created = ('_id' not in doc or force_insert)
signals.pre_save_post_validation.send(self.__class__, document=self, signals.pre_save_post_validation.send(self.__class__, document=self,
created=created) created=created)

2
mongoengine/queryset/base.py
View File

@ -424,8 +424,6 @@ class BaseQuerySet(object):
if call_document_delete: if call_document_delete:
cnt = 0 cnt = 0
for doc in queryset: for doc in queryset:
# How the fuck did this worked before ???
# doc.delete(write_concern=write_concern)
doc.delete(**write_concern) doc.delete(**write_concern)
cnt += 1 cnt += 1
return cnt return cnt

10
tests/document/indexes.py
View File

@ -509,12 +509,12 @@ class IndexesTest(unittest.TestCase):
self.assertEqual(BlogPost.objects.count(), 10) self.assertEqual(BlogPost.objects.count(), 10)
self.assertEqual(BlogPost.objects.hint().count(), 10) self.assertEqual(BlogPost.objects.hint().count(), 10)
# here we seem to have find a bug in PyMongo 3.
# The cursor first makes a SON out of the list of tuples
# Then later reuses it and wonders why is it not a list of tuples
self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10) # PyMongo 3.0 bug
if pymongo.version != '3.0':
self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
if pymongo.version >= '2.8': if pymongo.version >= '2.8':
self.assertEqual(BlogPost.objects.hint('tags').count(), 10) self.assertEqual(BlogPost.objects.hint('tags').count(), 10)