diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-30 03:56:49 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-06-30 03:56:49 +0000 |
| commit | 6446bb1360d23bcf4500d7afe63cf84cd1957665 (patch) | |
| tree | 782d01a6204e89eef5e08d689bd3255ae18624bd /lib/sqlalchemy/orm/dependency.py | |
| parent | a8c2b7b97902fa9dd69a11f696ad2d4e0bf6328b (diff) | |
| download | sqlalchemy-6446bb1360d23bcf4500d7afe63cf84cd1957665.tar.gz | |
fixes to attributes/related so that get_history with passive=True returns no
AttributeHistory object if an untriggered callable was found (not sure how this used to work
OK....)
Diffstat (limited to 'lib/sqlalchemy/orm/dependency.py')
| -rw-r--r-- | lib/sqlalchemy/orm/dependency.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/sqlalchemy/orm/dependency.py b/lib/sqlalchemy/orm/dependency.py index 6eca75ae1..8970dab50 100644 --- a/lib/sqlalchemy/orm/dependency.py +++ b/lib/sqlalchemy/orm/dependency.py @@ -118,9 +118,9 @@ class OneToManyDP(DependencyProcessor): self._synchronize(obj, child, None, False) if child is not None and self.post_update: uowcommit.register_object(child, postupdate=True) - for child in childlist.deleted_items(): - if not self.cascade.delete_orphan: - self._synchronize(obj, child, None, True) + for child in childlist.deleted_items(): + if not self.cascade.delete_orphan: + self._synchronize(obj, child, None, True) def preprocess_dependencies(self, task, deplist, uowcommit, delete = False): #print self.mapper.mapped_table.name + " " + self.key + " " + repr(len(deplist)) + " preprocess_dep isdelete " + repr(delete) + " direction " + repr(self.direction) @@ -161,13 +161,13 @@ class OneToManyDP(DependencyProcessor): for child in childlist.added_items(): if child is not None: uowcommit.register_object(child) - for child in childlist.deleted_items(): - if not self.cascade.delete_orphan: - uowcommit.register_object(child, isdelete=False) - elif childlist.hasparent(child) is False: - uowcommit.register_object(child, isdelete=True) - for c in self.mapper.cascade_iterator('delete', child): - uowcommit.register_object(c, isdelete=True) + for child in childlist.deleted_items(): + if not self.cascade.delete_orphan: + uowcommit.register_object(child, isdelete=False) + elif childlist.hasparent(child) is False: + uowcommit.register_object(child, isdelete=True) + for c in self.mapper.cascade_iterator('delete', child): + uowcommit.register_object(c, isdelete=True) def _synchronize(self, obj, child, associationrow, clearkeys): source = obj |