summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-06 11:36:57 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-06 11:36:57 -0400
commit63e2a0f8eba8c2a3b522abb86d17edb6c7bc94ee (patch)
tree68208a28238272d38db5758105cd853a014e5e0c /lib/sqlalchemy
parentb5c310c27928cbb1922ee34a978b8ac724c4cc42 (diff)
downloadsqlalchemy-63e2a0f8eba8c2a3b522abb86d17edb6c7bc94ee.tar.gz
- [bug] Improvements to joined/subquery eager
loading dealing with chains of subclass entities sharing a common base, with no specific "join depth" provided. Will chain out to each subclass mapper individually before detecting a "cycle", rather than considering the base class to be the source of the "cycle". [ticket:2481]
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 27d9b1b69..5f6c8d4a0 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -288,7 +288,7 @@ class PathRegistry(object):
return len(self.path)
def contains_mapper(self, mapper):
- return mapper.base_mapper in self.reduced_path
+ return mapper in self.path
def contains(self, reg, key):
return (key, self.reduced_path) in reg._attributes