summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2005-09-23 03:10:05 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2005-09-23 03:10:05 +0000
commitdcd08bb8d9f93ae1395bbc2d29cb828891f2cf9a (patch)
tree503a69e14ce9d487d712e0d0c72d2ef0ed76f5a2 /lib/sqlalchemy/sql.py
parenta0462f72c7a7d8bf957521361a3f1480823010c5 (diff)
downloadsqlalchemy-dcd08bb8d9f93ae1395bbc2d29cb828891f2cf9a.tar.gz
Diffstat (limited to 'lib/sqlalchemy/sql.py')
-rw-r--r--lib/sqlalchemy/sql.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index b3ce57047..aa247836c 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)