From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 30 Jan 2011 19:12:03 +0000 (-0500)
Subject: yikes, change that name on the Alias class too
X-Git-Tag: rel_0_7b1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c05a8988bbda34161976a493e61c681d5f7bfcf7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

yikes, change that name on the Alias class too
---

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 10041940a1..3bc056fae2 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):