expunge wasnt de-associating the object with a session

diff --git a/CHANGES b/CHANGES
index 16e6a05d4dceb806a79b5416664395f4f76ebfa9..ffc2e51864c2d7efd8bab7e44c1b0790f5330db0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ of subclassed directly.
 - activemapper will use threadlocal's objectstore if the mod is
 activated when activemapper is imported
 - small fix to URL regexp to allow filenames with '@' in them
+- fixes to Session expunge/update/etc.
 
 0.2.5
 - fixed endless loop bug in select_by(), if the traversal hit

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 5bed7181cc78f15db6ae207c48c107fa6611c863..82e1c6d6deebee3e4a086eb395d81be046c9c87e 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -266,6 +266,7 @@ class Session(object):
     def expunge(self, object):
         """removes the given object from this Session.  this will free all internal references to the object."""
         self.uow.expunge(object)
+        self._unattach(object)
         
     def save(self, object, entity_name=None):
         """