Ticket #6940: orm-count-fix.patch

django/db/models/query.py

@@ -231 +231 @@
 
         try:
             select, sql, params = counter._get_sql_clause()
+
+            formats_in_select = sum( [ 1 if s else -1 for s in ",".join( select ).split( "%" ) ] ) - 1
         except EmptyResultSet:
             return 0
 
@@ -238 +240 @@
         if self._distinct:
             id_col = "%s.%s" % (connection.ops.quote_name(self.model._meta.db_table),
                     connection.ops.quote_name(self.model._meta.pk.column))
-            cursor.execute("SELECT COUNT(DISTINCT(%s))" % id_col + sql, params)
+            cursor.execute("SELECT COUNT(DISTINCT(%s))" % id_col + sql, params[formats_in_select:])
         else:
-            cursor.execute("SELECT COUNT(*)" + sql, params)
+            cursor.execute("SELECT COUNT(*)" + sql, params[formats_in_select:])
         count = cursor.fetchone()[0]
 
         # Apply any offset and limit constraints manually, since using LIMIT or