From: Mike Bayer Date: Thu, 25 Mar 2010 00:46:14 +0000 (-0400) Subject: this is needed for correct pathing, however some tests now fail. need tests for... X-Git-Tag: rel_0_6beta3~12^2~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f10b94dfd89707fd7b69ddfa9ac849b0f092e55b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git this is needed for correct pathing, however some tests now fail. need tests for this --- diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index f4f3b58214..a766aab09d 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -656,7 +656,7 @@ class SubqueryLoader(AbstractRelationshipLoader): subq_path = subq_path + path - reduced_path = interfaces._reduce_path(subq_path) + reduced_path = interfaces._reduce_path(path) # join-depth / recursion check if ("loaderstrategy", reduced_path) not in context.attributes: @@ -780,7 +780,7 @@ class SubqueryLoader(AbstractRelationshipLoader): # add new query to attributes to be picked up # by create_row_processor - context.attributes[('subquery', interfaces._reduce_path(path))] = q + context.attributes[('subquery', reduced_path)] = q def _local_remote_columns(self, prop): if prop.secondary is None: