summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-06-04 18:23:06 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-06-04 18:23:06 -0400
commit11578ba709ff3e5f2a2a2a9f92bf6fdc2ee6d328 (patch)
tree4202758c520dd62e85f18dc37da60d5774d375c8 /lib/sqlalchemy/sql/expression.py
parent58e917fe2de2f4b643f3bf2468f51aef27e67747 (diff)
downloadsqlalchemy-11578ba709ff3e5f2a2a2a9f92bf6fdc2ee6d328.tar.gz
- improve overlapping selectables, apply to both query and relationship
- clean up inspect() calls within query._join() - make sure join.alias(flat) propagates - fix almost all assertion tests
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 633a3ddba..e7ef3cb72 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -4001,7 +4001,8 @@ class Join(FromClause):
"""
if flat:
assert name is None, "Can't send name argument with flat"
- left_a, right_a = self.left.alias(), self.right.alias()
+ left_a, right_a = self.left.alias(flat=True), \
+ self.right.alias(flat=True)
adapter = sqlutil.ClauseAdapter(left_a).\
chain(sqlutil.ClauseAdapter(right_a))