From 2dba55cb27cf52fb41533ff0cf85096db38b5d9d Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 7 Feb 2009 21:57:30 +0000
Subject: - When flushing partial sets of objects using
 session.flush([somelist]), pending objects which remain pending after the
 operation won't inadvertently be added as persistent. [ticket:1306]

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

(limited to 'lib/sqlalchemy')

diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index c756045a1..61c58b249 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -267,7 +267,7 @@ class UOWTransaction(object):
         for elem in self.elements:
             if elem.isdelete:
                 self.session._remove_newly_deleted(elem.state)
-            else:
+            elif not elem.listonly:
                 self.session._register_newly_persistent(elem.state)
 
     def _sort_dependencies(self):
-- 
cgit v1.2.1