diff options
author | mike bayer <mike_mp@zzzcomputing.com> | 2017-04-03 12:37:35 -0400 |
---|---|---|
committer | Gerrit Code Review <gerrit@awstats.zzzcomputing.com> | 2017-04-03 12:37:35 -0400 |
commit | 6dfc5b36b86948dc115a4ce3b6d24d3dae551d70 (patch) | |
tree | a18368e90ee6ef593120dfb0f6fd31f9081263e1 /lib/sqlalchemy/sql | |
parent | 6d7d48af0dec6325f87ce497f769827107ad5035 (diff) | |
parent | 7bb4923391f98db517dde59d813322a948d10bfe (diff) | |
download | sqlalchemy-6dfc5b36b86948dc115a4ce3b6d24d3dae551d70.tar.gz |
Merge "Use consistent method signature for Alias.self_group()"
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index b69d667c6..9db1e0844 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -1241,13 +1241,13 @@ class Alias(FromClause): or 'anon')) self.name = name - def self_group(self, target=None): - if isinstance(target, CompoundSelect) and \ + def self_group(self, against=None): + if isinstance(against, CompoundSelect) and \ isinstance(self.original, Select) and \ self.original._needs_parens_for_grouping(): return FromGrouping(self) - return super(Alias, self).self_group(target) + return super(Alias, self).self_group(against=against) @property def description(self): @@ -2269,7 +2269,7 @@ class CompoundSelect(GenerativeSelect): n + 1, len(s.c._all_columns)) ) - self.selects.append(s.self_group(self)) + self.selects.append(s.self_group(against=self)) GenerativeSelect.__init__(self, **kwargs) |