From 7d3ba0dec7c5e64f62108d7c4fb9b0cec1cc586a Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 16 May 2008 22:15:44 +0000
Subject: dont raise assertions when in autocommit mode [ticket:1046]

---
 lib/sqlalchemy/orm/session.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sqlalchemy')

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 440f69ae8..5583012e5 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -253,7 +253,7 @@ class SessionTransaction(object):
         if self.nested:
             self.session.flush()
             
-        if self.autoflush:
+        if self.autoflush and not self.session.autocommit:
             # TODO: the "dirty_states" assertion is expensive,
             # so consider these assertions as temporary
             # during development
-- 
cgit v1.2.1