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

Merge branch 'single-work-op' of https://github.com/njoyce/mongoengine into 211

Browse Source 
Conflicts:
	mongoengine/document.py
	tests/test_document.py
This commit is contained in:
Ross Lawley
2013-01-28 15:05:12 +00:00
parent 1ca098c402 7bb9c7d47f
commit d90890c08e
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mongoengine/document.py
View File

@@ -250,16 +250,16 @@ class Document(BaseDocument):
return created
upsert = self._created
update_query = {}
if updates:
last_error = collection.update(select_dict,
{"$set": updates}, upsert=upsert, safe=safe,
**write_options)
created = is_new_object(last_error)
update_query["$set"] = updates
if removals:
last_error = collection.update(select_dict,
{"$unset": removals}, upsert=upsert, safe=safe,
**write_options)
created = created or is_new_object(last_error)
update_query["$unset"] = removals
if updates or removals:
last_error = collection.update(select_dict, update_query,
upsert=upsert, safe=safe, **write_options)
created = is_new_object(last_error)
warn_cascade = not cascade and 'cascade' not in self._meta
cascade = (self._meta.get('cascade', True)