fixup! changed session's save() logic

ming/metadata.pyi

@@ -1,6 +1,7 @@
 from bson import ObjectId
 from datetime import datetime
 from typing import Generic, TypeVar, Any, Optional, overload, List, Dict, Type, Union, Mapping, type_check_only
+from pymongo.results import UpdateResult, DeleteResult
 
 import bson
 from ming.base import Cursor
@@ -178,7 +179,6 @@ class Field:
 M = TypeVar('M')
 
 MongoFilter = dict
-ChangeResult = dict
 SaveResult = Union[ObjectId, Any]
 class _ClassManager(Generic[M]):
     # proxies these from Session
@@ -190,9 +190,9 @@ class _ClassManager(Generic[M]):
     def find_by(self, filter: MongoFilter, *args, validate: bool = True, **kwargs) -> Cursor[M]: ...
     #@overload
     #def find_by(self, filter: MongoFilter, *args, validate: Literal[False], **kwargs) -> Generator[M]: ...
-    def remove(self, spec_or_id: Union[MongoFilter, ObjectId] = None, **kwargs) -> ChangeResult: ...
+    def remove(self, spec_or_id: Union[MongoFilter, ObjectId] = None, **kwargs) -> DeleteResult: ...
     def count(self) -> int: ...
-    def update_partial(self, filter: MongoFilter, fields: dict, **kwargs) -> ChangeResult: ...
+    def update_partial(self, filter: MongoFilter, fields: dict, **kwargs) -> UpdateResult: ...
     def find_one_and_update(self, **kwargs) -> M: ...
     def find_one_and_replace(self, **kwargs) -> M: ...
     def find_one_and_delete(self, **kwargs) -> M: ...
@@ -209,9 +209,9 @@ class _InstanceManager:
     # proxies these from Session
     def save(self, *args: str, **kwargs) -> SaveResult: ...
     def insert(self, **kwargs) -> SaveResult: ...
-    def upsert(self, spec_fields: List[str], **kwargs) -> ChangeResult: ...
-    def delete(self) -> ChangeResult: ...
-    def set(self, fields_values: Mapping[str, Any]) -> ChangeResult: ...
+    def upsert(self, spec_fields: List[str], **kwargs) -> UpdateResult: ...
+    def delete(self) -> DeleteResult: ...
+    def set(self, fields_values: Mapping[str, Any]) -> UpdateResult: ...
     def increase_field(self, **kwargs) -> None: ...
 
 

ming/session.py

@@ -166,31 +166,33 @@ def save(self, doc, *args, **kwargs) -> bson.ObjectId:
            |---------------------------|
         """
         data = self._prep_save(doc, kwargs.pop('validate', True))
-        _id = getattr(doc, '_id', None) or None
+
+        # if _id is None:
+        #     doc.pop('_id', None)
 
         new_id = None
         if args:
-            if not _id:
-                raise ValueError('Cannot save a subset without an _id')
-            else:
+            if '_id' in doc:
                 arg_data = {arg: data[arg] for arg in args}
                 result = self._impl(doc).update_one(
-                    dict(_id=_id), {'$set': arg_data},
+                    dict(_id=doc._id), {'$set': arg_data},
                     **fix_write_concern(kwargs)
                 )
-        else:
-            if not _id:
-                result = self._impl(doc).insert_one(
-                    data, **fix_write_concern(kwargs)
-                )
-                new_id = result.inserted_id
             else:
+                raise ValueError('Cannot save a subset without an _id')
+        else:
+            if '_id' in doc:
                 result = self._impl(doc).replace_one(
-                    dict(_id=_id), data,
+                    dict(_id=doc._id), data,
                     upsert=True, **fix_write_concern(kwargs)
                 )
                 new_id = result.upserted_id
-            if result and '_id' not in doc and new_id:
+            else:
+                result = self._impl(doc).insert_one(
+                    data, **fix_write_concern(kwargs)
+                )
+                new_id = result.inserted_id
+            if result and ('_id' not in doc) and (new_id is not None):
                 doc._id = new_id
 
         return result

ming/tests/test_session.py

@@ -67,7 +67,7 @@ def test_base_session(self):
 
         doc = TestDoc({})
         sess.save(doc)
-        impl.replace_one.assert_called_with(dict(_id=None), doc, upsert=True)
+        impl.replace_one.assert_called_with(dict(_id=doc._id), doc, upsert=True)
         self.assertEqual(doc.a, None)
         self.assertEqual(doc.b, dict(a=None))
         del doc._id