Ticket #10160: 10160-2.diff

django/db/models/sql/where.py

@@ -160 +160 @@
             extra = ''
 
         if lookup_type in connection.operators:
-            format = "%s %%s %s" % (connection.ops.lookup_cast(lookup_type),
-                    extra)
+            format = "%s %%s %%s" % (connection.ops.lookup_cast(lookup_type),)
             return (format % (field_sql,
-                    connection.operators[lookup_type] % cast_sql), params)
+                              connection.operators[lookup_type] % cast_sql,
+                              extra), params)
 
         if lookup_type == 'in':
             if not value_annot:

django/db/models/sql/expressions.py

@@ -64 +64 @@
             if hasattr(child, 'evaluate'):
                 sql, params = child.evaluate(self, qn)
             else:
-                try:
-                    sql, params = qn(child), ()
-                except:
-                    sql, params = str(child), ()
+                sql, params = '%s', (child,)
 
             if hasattr(child, 'children') > 1:
                 format = '(%s)'