[SQL-CVS] r934 - trunk/SQLObject/sqlobject
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2005-08-22 06:02:21
|
Author: phd
Date: 2005-08-22 06:02:19 +0000 (Mon, 22 Aug 2005)
New Revision: 934
Modified:
trunk/SQLObject/sqlobject/dbconnection.py
Log:
Fixed a case where id is in kw but there are also other keywords.
Modified: trunk/SQLObject/sqlobject/dbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/dbconnection.py 2005-08-22 06:01:34 UTC (rev 933)
+++ trunk/SQLObject/sqlobject/dbconnection.py 2005-08-22 06:02:19 UTC (rev 934)
@@ -625,16 +625,15 @@
data = {}
if 'id' in kw:
data[soClass.sqlmeta.idName] = kw['id']
- else:
- for key, col in soClass.sqlmeta.columns.items():
- if key in kw:
- data[col.dbName] = kw[key]
- elif col.foreignName in kw:
- obj = kw[col.foreignName]
- if obj is None:
- data[col.dbName] = None
- else:
- data[col.dbName] = obj.id
+ for key, col in soClass.sqlmeta.columns.items():
+ if key in kw:
+ data[col.dbName] = kw[key]
+ elif col.foreignName in kw:
+ obj = kw[col.foreignName]
+ if obj is None:
+ data[col.dbName] = None
+ else:
+ data[col.dbName] = obj.id
return ' AND '.join(
['%s %s %s' %
(dbName, ops.get(value, "="), self.sqlrepr(value))
|