From 11578ba709ff3e5f2a2a2a9f92bf6fdc2ee6d328 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 4 Jun 2013 18:23:06 -0400 Subject: - 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 --- lib/sqlalchemy/sql/expression.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy/sql/expression.py') 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)) -- cgit v1.2.1