From: Mike Bayer Date: Thu, 26 Apr 2007 18:14:33 +0000 (+0000) Subject: decruftify UOW some more....uowdumper always prints out based on X-Git-Tag: rel_0_3_7~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaff9a5aafac6a6128152e36b978a9f233a87fd3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git decruftify UOW some more....uowdumper always prints out based on polymorphic collections --- diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index a5feefeeb1..732970cad2 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -656,15 +656,9 @@ class UOWTask(object): polymorphic_tosave_elements = property(lambda self: [rec for rec in self.polymorphic_elements if not rec.isdelete]) - tosave_elements = property(lambda self: [rec for rec in self.elements - if not rec.isdelete]) - polymorphic_todelete_elements = property(lambda self:[rec for rec in self.polymorphic_elements if rec.isdelete]) - todelete_elements = property(lambda self:[rec for rec in self.elements - if rec.isdelete]) - polymorphic_tosave_objects = property(lambda self:[rec.obj for rec in self.polymorphic_elements if rec.obj is not None and not rec.listonly and rec.isdelete is False]) diff --git a/lib/sqlalchemy/orm/uowdumper.py b/lib/sqlalchemy/orm/uowdumper.py index d41e9660ea..22b0ec8283 100644 --- a/lib/sqlalchemy/orm/uowdumper.py +++ b/lib/sqlalchemy/orm/uowdumper.py @@ -135,9 +135,9 @@ class UOWDumper(unitofwork.UOWExecutor): def _dump_processor(self, proc, deletes): if deletes: - val = proc.targettask.todelete_elements + val = proc.targettask.polymorphic_todelete_elements else: - val = proc.targettask.tosave_elements + val = proc.targettask.polymorphic_tosave_elements if self.verbose: self.buf.write(self._indent() + " |- %s attribute on %s (UOWDependencyProcessor(%d) processing %s)\n" % (