diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-03-21 17:21:41 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-03-21 17:21:41 +0000 |
| commit | 6bc2784a4d2ce6f880c9d36daad4205127f6336b (patch) | |
| tree | 4b4e994a0b0ae5b2b100f908ea11b1c6c208aa1d /lib/sqlalchemy | |
| parent | 55192da8993bb89b637312fba319a412eb6ceabd (diff) | |
| download | sqlalchemy-6bc2784a4d2ce6f880c9d36daad4205127f6336b.tar.gz | |
- made some fixes to the "from_joinpoint" argument to
query.join() so that if the previous join was aliased
and this one isn't, the join still happens successfully.
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 381263925..ad8ec33f8 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -490,6 +490,8 @@ class Query(object): adapt_against = self.table elif start.select_table is not start.mapped_table: # in the middle of a join, look for a polymorphic mapper adapt_against = start.select_table + elif self._aliases: # joining against aliases + adapt_against = self._aliases.alias else: adapt_against = None |