[SQL-CVS] r1332 - home/phd/SQLObject/paramstyles/sqlobject

[<sub...@co...>]

Author: phd
Date: 2005-12-01 17:20:06 +0000 (Thu, 01 Dec 2005)
New Revision: 1332

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
Log:
Converted _SO_update().


Modified: home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py	2005-11-30 18:40:48 UTC (rev 1331)
+++ home/phd/SQLObject/paramstyles/sqlobject/dbconnection.py	2005-12-01 17:20:06 UTC (rev 1332)
@@ -299,18 +299,15 @@
             threadName = ''
         print '%(n)2i%(threadName)s/%(name)s%(spaces)s%(sep)s %(s)s' % locals()
 
-    def _convertQuery(self, query):
-        paramstyle = self.module.paramstyle
-        converter = getattr(DBSingleStyle, "to_" + paramstyle)
-        return converter(query.query_list)
-
     def _executeRetry(self, conn, cursor, query):
         if isinstance(query, str):
             if self.debug:
                 self.printDebug(conn, query, 'QueryR')
             return cursor.execute(query)
         elif isinstance(query, sqlbuilder.SQLList):
-            query_string, params = self._convertQuery(query)
+            paramstyle = self.module.paramstyle
+            converter = getattr(DBSingleStyle, "to_" + paramstyle)
+            query_string, params = converter(query.query_list)
             if self.debug:
                 self.printDebug(conn, query_string, 'QueryString')
                 self.printDebug(conn, params, 'QueryParams')
@@ -616,12 +613,14 @@
     # in the SQLObject class.
 
     def _SO_update(self, so, values):
-        self.query("UPDATE %s SET %s WHERE %s = %s" %
-                   (so.sqlmeta.table,
-                    ", ".join(["%s = %s" % (dbName, self.sqlrepr(value))
-                               for dbName, value in values]),
-                    so.sqlmeta.idName,
-                    self.sqlrepr(so.id)))
+        query_list = ["UPDATE %s SET " % so.sqlmeta.table]
+        for dbName, value in values:
+            query_list.append("%s=" % dbName)
+            query_list.append(DBSingleStyle.Param(value))
+        query_list.append(" WHERE ")
+        query_list.append("%s=" % so.sqlmeta.idName)
+        query_list.append(DBSingleStyle.Param(so.id))
+        self.query(sqlbuilder.SQLList(query_list))
 
     def _SO_selectOne(self, so, columnNames):
         columns = ", ".join(columnNames)