From f2cf62090c4f9812bf4a57a9f68172b1b2eafd6c Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 26 Jun 2014 14:58:42 -0400 Subject: - Fixed bug involving dynamic attributes, that was again a regression of :ticket:`3060` from verision 0.9.5. A self-referential relationship with lazy='dynamic' would raise a TypeError within a flush operation. fixes #3099 --- lib/sqlalchemy/orm/dynamic.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py index bae09d32d..82e0b0048 100644 --- a/lib/sqlalchemy/orm/dynamic.py +++ b/lib/sqlalchemy/orm/dynamic.py @@ -171,9 +171,10 @@ class DynamicAttributeImpl(attributes.AttributeImpl): c = self._get_collection_history(state, passive) return c.as_history() - def get_all_pending(self, state, dict_): + def get_all_pending(self, state, dict_, + passive=attributes.PASSIVE_NO_INITIALIZE): c = self._get_collection_history( - state, attributes.PASSIVE_NO_INITIALIZE) + state, passive) return [ (attributes.instance_state(x), x) for x in -- cgit v1.2.1