summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/dynamic.py
diff options
context:
space:
mode:
authorChris Mcdonough <chrism@plope.com>2007-12-12 20:20:03 +0000
committerChris Mcdonough <chrism@plope.com>2007-12-12 20:20:03 +0000
commit6f6a0981351697192651ef7437fdc451c1ad71ab (patch)
treed5b302c360710eb53fc046269845bb24ec161630 /lib/sqlalchemy/orm/dynamic.py
parentbdd922ad0d94953c53e654893889e5aa7ed00685 (diff)
downloadsqlalchemy-6f6a0981351697192651ef7437fdc451c1ad71ab.tar.gz
bug fixes
- the call to self.get() in get_committed_state was missing a required parameter, rendered sqlalchemy unusable in certain situations - fixed a large bug in dynamic_loader() where the query criterion wasn't generated correctly if other relations existed to dynamic_loader's argument
Diffstat (limited to 'lib/sqlalchemy/orm/dynamic.py')
-rw-r--r--lib/sqlalchemy/orm/dynamic.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/dynamic.py b/lib/sqlalchemy/orm/dynamic.py
index af1be28bc..63bdaea40 100644
--- a/lib/sqlalchemy/orm/dynamic.py
+++ b/lib/sqlalchemy/orm/dynamic.py
@@ -117,7 +117,7 @@ class AppenderQuery(Query):
except exceptions.InvalidRequestError:
raise exceptions.InvalidRequestError("Parent instance %s is not bound to a Session, and no contextual session is established; lazy load operation of attribute '%s' cannot proceed" % (mapperutil.instance_str(instance), self.attr.key))
- return sess.query(self.attr.target_mapper).with_parent(instance)
+ return sess.query(self.attr.target_mapper).with_parent(instance, self.attr.key)
def assign(self, collection):
instance = self.state.obj()