diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-16 22:25:53 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-05-16 22:25:53 +0000 |
| commit | fcc4f9193a06aa87b0d95636af64213262a429e5 (patch) | |
| tree | 81a48bdaaa2cc04bdd265d6ed2093e309cd0d192 /lib/sqlalchemy | |
| parent | 7d3ba0dec7c5e64f62108d7c4fb9b0cec1cc586a (diff) | |
| download | sqlalchemy-fcc4f9193a06aa87b0d95636af64213262a429e5.tar.gz | |
begin() pre-issues a flush() in all cases, better fix for [ticket:1046] and allows rollback to work properly with autocommit=True/begin()
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 5583012e5..c34a695e3 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -250,17 +250,9 @@ class SessionTransaction(object): self._deleted = self._parent._deleted return - if self.nested: + if self.autoflush: self.session.flush() - if self.autoflush and not self.session.autocommit: - # TODO: the "dirty_states" assertion is expensive, - # so consider these assertions as temporary - # during development - assert not self.session._new - assert not self.session._deleted - assert not self.session._dirty_states - self._new = weakref.WeakKeyDictionary() self._deleted = weakref.WeakKeyDictionary() |