Fixed #23460 -- Added literal `%s` support to extra() QuerySets.

2 files changed, 9 insertions, 5 deletions

diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 294eeb6ef5..c7d3bf6b90 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -1144,11 +1144,12 @@ of the arguments is required, but you should use at least one of them.
           select=OrderedDict([('a', '%s'), ('b', '%s')]),
           select_params=('one', 'two'))
 
-  The only thing to be careful about when using select parameters in
-  ``extra()`` is to avoid using the substring ``"%%s"`` (that's *two*
-  percent characters before the ``s``) in the select strings. Django's
-  tracking of parameters looks for ``%s`` and an escaped ``%`` character
-  like this isn't detected. That will lead to incorrect results.
+  If you need to use a literal ``%s`` inside your select string, use
+  the sequence ``%%s``.
+
+  .. versionchanged:: 1.8
+
+      Prior to 1.8, you were unable to escape a literal ``%s``.
 
 * ``where`` / ``tables``
 
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index c77b40a6a3..15fe657d4b 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -281,6 +281,9 @@ Models
   Django uses whenever objects are loaded using the ORM. The method allows
   customizing model loading behavior.
 
+* ``extra(select={...})`` now allows you to escape a literal ``%s`` sequence
+  using ``%%s``.
+
 Signals
 ^^^^^^^