From af38982273a67ba362d09bebae5e08b8593ce093 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 15 Jul 2008 14:54:37 +0000 Subject: [PATCH] - Added a new SessionExtension hook called after_attach(). This is called at the point of attachment for objects via add(), add_all(), delete(), and merge(). --- CHANGES | 7 +++++++ VERSION | 2 +- lib/sqlalchemy/orm/interfaces.py | 5 +++++ lib/sqlalchemy/orm/session.py | 2 ++ test/orm/session.py | 7 +++++-- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 28672f8a40..ead13a5309 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,13 @@ ======= CHANGES ======= +0.5beta3 +======== +- orm + - Added a new SessionExtension hook called after_attach(). + This is called at the point of attachment for objects + via add(), add_all(), delete(), and merge(). + 0.5beta2 ======== - 0.5beta2 includes all bugfixes listed under release diff --git a/VERSION b/VERSION index 0b2f967008..3f499c3151 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.0beta2 +0.5.0beta3 diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index 4cfc9462aa..96a6e340c1 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -301,6 +301,11 @@ class SessionExtension(object): engine level transaction is begun on a connection. """ + def after_attach(self, session, instance): + """Execute after an instance is attached to a session. + + This is called after an add, delete or merge. + """ class MapperProperty(object): """Manage the relationship of a ``Mapper`` to a single class diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index b9f1707330..380bc86221 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -1283,6 +1283,8 @@ class Session(object): state.session_id, self.hash_key)) if state.session_id != self.hash_key: state.session_id = self.hash_key + if self.extension is not None: + self.extension.after_attach(self, state.obj()) def __contains__(self, instance): """Return True if the instance is associated with this session. diff --git a/test/orm/session.py b/test/orm/session.py index 02258a75e0..1e2b3c9dd6 100644 --- a/test/orm/session.py +++ b/test/orm/session.py @@ -889,18 +889,21 @@ class SessionTest(_fixtures.FixtureTest): log.append('after_flush_postexec') def after_begin(self, session, transaction, connection): log.append('after_begin') + def after_attach(self, session, instance): + log.append('after_attach') + sess = create_session(extension = MyExt()) u = User(name='u1') sess.add(u) sess.flush() - assert log == ['before_flush', 'after_begin', 'after_flush', 'before_commit', 'after_commit', 'after_flush_postexec'] + assert log == ['after_attach', 'before_flush', 'after_begin', 'after_flush', 'before_commit', 'after_commit', 'after_flush_postexec'] log = [] sess = create_session(autocommit=False, extension=MyExt()) u = User(name='u1') sess.add(u) sess.flush() - assert log == ['before_flush', 'after_begin', 'after_flush', 'after_flush_postexec'] + assert log == ['after_attach', 'before_flush', 'after_begin', 'after_flush', 'after_flush_postexec'] log = [] u.name = 'ed' -- 2.47.3