From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 22 Jul 2009 20:41:33 +0000 (+0000)
Subject: ensure "rowswitch" for isdelete is supported
X-Git-Tag: rel_0_5_6~37
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0eb14e7ec57fbcfff1c17d6b5736c13e3b980b00;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

ensure "rowswitch" for isdelete is supported
---

diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py
index ef5b9fc1ab..6a3d0ca591 100644
--- a/lib/sqlalchemy/orm/unitofwork.py
+++ b/lib/sqlalchemy/orm/unitofwork.py
@@ -125,11 +125,13 @@ class UOWTransaction(object):
         # if object is not in the overall session, do nothing
         if not self.session._contains_state(state):
             if self._should_log_debug:
-                self.logger.debug("object %s not part of session, not registering for flush" % (mapperutil.state_str(state)))
+                self.logger.debug("object %s not part of session, not registering for flush" % 
+                                        (mapperutil.state_str(state)))
             return
 
         if self._should_log_debug:
-            self.logger.debug("register object for flush: %s isdelete=%s listonly=%s postupdate=%s" % (mapperutil.state_str(state), isdelete, listonly, postupdate))
+            self.logger.debug("register object for flush: %s isdelete=%s listonly=%s postupdate=%s"
+                                    % (mapperutil.state_str(state), isdelete, listonly, postupdate))
 
         mapper = _state_mapper(state)
 
@@ -719,7 +721,7 @@ class UOWDependencyProcessor(object):
 
         elements = [e for e in 
                     self.targettask.filter_polymorphic_elements(self._mappers) 
-                    if e.isdelete==delete]
+                    if bool(e.isdelete)==delete]
 
         self.processor.process_dependencies(
             self.targettask,