From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 23 Sep 2005 03:10:05 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~619
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd08bb8d9f93ae1395bbc2d29cb828891f2cf9a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index b3ce570473..aa247836c3 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -432,7 +432,7 @@ class Join(Selectable):
         if allcols:
             self.columns = [c for c in self.left.columns] + [c for c in self.right.columns]
         else:
-            self.columns = [c for c in self.right.columns]
+            self.columns = self.right.columns
 
         # TODO: if no onclause, do NATURAL JOIN
         self.onclause = onclause
@@ -586,8 +586,8 @@ class TableImpl(Selectable):
     def insert(self, select = None):
         return insert(self.table, select = select)
 
-    def update(self, whereclause = None, parameters = None):
-        return update(self.table, whereclause, parameters)
+    def update(self, whereclause = None, values = None):
+        return update(self.table, whereclause, values)
 
     def delete(self, whereclause = None):
         return delete(self.table, whereclause)