minor tweaks
This commit is contained in:
parent
a120eae5ae
commit
d05301b3a1
@ -344,8 +344,8 @@ class Document(BaseDocument):
|
|||||||
write_concern)
|
write_concern)
|
||||||
|
|
||||||
if cascade is None:
|
if cascade is None:
|
||||||
cascade = self._meta.get(
|
cascade = (self._meta.get('cascade', False) or
|
||||||
'cascade', False) or cascade_kwargs is not None
|
cascade_kwargs is not None)
|
||||||
|
|
||||||
if cascade:
|
if cascade:
|
||||||
kwargs = {
|
kwargs = {
|
||||||
@ -358,6 +358,7 @@ class Document(BaseDocument):
|
|||||||
kwargs.update(cascade_kwargs)
|
kwargs.update(cascade_kwargs)
|
||||||
kwargs['_refs'] = _refs
|
kwargs['_refs'] = _refs
|
||||||
self.cascade_save(**kwargs)
|
self.cascade_save(**kwargs)
|
||||||
|
|
||||||
except pymongo.errors.DuplicateKeyError as err:
|
except pymongo.errors.DuplicateKeyError as err:
|
||||||
message = u'Tried to save duplicate unique keys (%s)'
|
message = u'Tried to save duplicate unique keys (%s)'
|
||||||
raise NotUniqueError(message % six.text_type(err))
|
raise NotUniqueError(message % six.text_type(err))
|
||||||
@ -416,10 +417,9 @@ class Document(BaseDocument):
|
|||||||
object_id = doc['_id']
|
object_id = doc['_id']
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
|
select_dict = {}
|
||||||
if save_condition is not None:
|
if save_condition is not None:
|
||||||
select_dict = transform.query(self.__class__, **save_condition)
|
select_dict = transform.query(self.__class__, **save_condition)
|
||||||
else:
|
|
||||||
select_dict = {}
|
|
||||||
|
|
||||||
select_dict['_id'] = object_id
|
select_dict['_id'] = object_id
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user