Fix insert followed by remove in the same transaction. The document w…

…as not removed from mongo.

CHANGES.txt

@@ -5,6 +5,9 @@ CHANGES
 0.8.4 (unreleased)
 ------------------
 
+- Fix insert followed by remove in the same transaction. The document was
+  not removed from mongo.
+
 - Fix transaction.abort() behaviour for complex objects. _py_type information
   is not lost after transaction abort().
 

src/mongopersist/datamanager.py

@@ -291,17 +291,19 @@ def insert(self, obj):
     def remove(self, obj):
         if obj._p_oid is None:
             raise ValueError('Object does not have OID.', obj)
-        # Edge case: The object was just added in this transaction.
-        if obj in self._inserted_objects:
-            self._inserted_objects.remove(obj)
-            return
         # If the object is still in the ghost state, let's load it, so that we
         # have the state in case we abort the transaction later.
         if obj._p_changed is None:
             self.setstate(obj)
         # Now we remove the object from Mongo.
         coll = self.get_collection_from_object(obj)
         coll.remove({'_id': obj._p_oid.id})
+        # Edge case: The object was just added in this transaction.
+        if obj in self._inserted_objects:
+            # but it still had to be removed from mongo, because insert
+            # inserted it just before
+            self._inserted_objects.remove(obj)
+            return
         self._removed_objects.append(obj)
         # Just in case the object was modified before removal, let's remove it
         # from the modification list: