diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-01-30 14:12:03 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2011-01-30 14:12:03 -0500 |
| commit | c05a8988bbda34161976a493e61c681d5f7bfcf7 (patch) | |
| tree | 3cce7630cf30718056e0c08b2b1ef54f5f221948 /lib/sqlalchemy/sql | |
| parent | 7ac30f96b9f506ef4ab34e1c725bf6911a6c22fb (diff) | |
| download | sqlalchemy-c05a8988bbda34161976a493e61c681d5f7bfcf7.tar.gz | |
yikes, change that name on the Alias class too
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 10041940a..3bc056fae 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -670,7 +670,7 @@ def alias(selectable, name=None): at compile time. """ - return Alias(selectable, alias=alias) + return Alias(selectable, name=name) def literal(value, type_=None): @@ -3356,7 +3356,7 @@ class Alias(FromClause): __visit_name__ = 'alias' named_with_column = True - def __init__(self, selectable, alias=None): + def __init__(self, selectable, name=None): baseselectable = selectable while isinstance(baseselectable, Alias): baseselectable = baseselectable.element @@ -3365,12 +3365,12 @@ class Alias(FromClause): if self.supports_execution: self._execution_options = baseselectable._execution_options self.element = selectable - if alias is None: + if name is None: if self.original.named_with_column: - alias = getattr(self.original, 'name', None) - alias = _generated_label('%%(%d %s)s' % (id(self), alias + name = getattr(self.original, 'name', None) + name = _generated_label('%%(%d %s)s' % (id(self), name or 'anon')) - self.name = alias + self.name = name @property def description(self): |