[SQL-CVS] r2443 - SQLObject/trunk/sqlobject

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

Author: phd
Date: 2007-03-22 10:22:46 -0600 (Thu, 22 Mar 2007)
New Revision: 2443

Modified:
   SQLObject/trunk/sqlobject/sqlbuilder.py
Log:
Do not run sqlrepr() if the clause is string.


Modified: SQLObject/trunk/sqlobject/sqlbuilder.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlbuilder.py	2007-03-21 16:47:33 UTC (rev 2442)
+++ SQLObject/trunk/sqlobject/sqlbuilder.py	2007-03-22 16:22:46 UTC (rev 2443)
@@ -602,10 +602,12 @@
             raise TypeError, "You must give a where clause or pass in None to indicate no where clause"
         self.whereClause = where
     def __sqlrepr__(self, db):
-        if self.whereClause is None:
+        whereClause = self.whereClause
+        if whereClause is None:
             return "DELETE FROM %s" % self.table
-        return "DELETE FROM %s WHERE %s" \
-               % (self.table, sqlrepr(self.whereClause, db))
+        if isinstance(whereClause, SQLExpression):
+            whereClause = sqlrepr(whereClause, db)
+        return "DELETE FROM %s WHERE %s" % (self.table, whereClause)
 
 registerConverter(Delete, SQLExprConverter)