From: Mike Bayer Date: Mon, 10 Jul 2006 21:32:34 +0000 (+0000) Subject: fix to error message for object with mismatched session X-Git-Tag: rel_0_2_6~33 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d89b81a1d9dd85e3dce3512643e9a077d60a2d44;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fix to error message for object with mismatched session --- diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index 92cf825d54..cda99a9027 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -143,7 +143,7 @@ class UnitOfWork(object): """validates that dirty/delete/flush operations can occur upon the given object, by checking if it has an instance key and that the instance key is present in the identity map.""" if hasattr(obj, '_instance_key') and not self.identity_map.has_key(obj._instance_key): - raise InvalidRequestError("Detected a mapped object not present in the current thread's Identity Map: '%s'. Use objectstore.import_instance() to place deserialized instances or instances from other threads" % repr(obj._instance_key)) + raise InvalidRequestError("Detected a mapped object not present in this Session's identity map: '%s'. Use session.merge() to place deserialized instances or instances from other threads" % repr(obj._instance_key)) def update(self, obj): """called to add an object to this UnitOfWork as though it were loaded from the DB,