mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-29 06:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Matt Robenolt 2014-09-10 07:23:58 +00:00 • committed by Tim Graham
parent 17557d068c
commit ef5f9b6ae8
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
django/db/models/sql/query.py
View file

@ -1775,7 +1775,8 @@ class Query(object):
entry_params = []
pos = entry.find("%s")
while pos != -1:
entry_params.append(next(param_iter))
if pos == 0 or entry[pos - 1] != '%':
entry_params.append(next(param_iter))
pos = entry.find("%s", pos + 2)
select_pairs[name] = (entry, entry_params)
# This is order preserving, since self.extra_select is an OrderedDict.