summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRaphael Michel <mail@raphaelmichel.de>2017-11-26 17:32:17 +0100
committerTim Graham <timograham@gmail.com>2017-11-27 11:40:09 -0500
commit899999db4293d40613626833860de28e8ccdd413 (patch)
tree90a6ce823ab5e56e87ad246af3262708fbd3126f /django
parenta09e974688e283019df32c35c6d7c217d1d16a8e (diff)
[1.11.x] Fixed #28848 -- Fixed SQLite/MySQL crash when ordering by a filtered subquery that uses nulls_first/nulls_last.
Backport of 616f468760e4984915bb2ccca6b9eb3d80ddadb0 from master
Diffstat (limited to 'django')
-rw-r--r--django/db/models/expressions.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index 2db832e1eb..e7084ebfc6 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -1063,6 +1063,7 @@ class OrderBy(BaseExpression):
}
placeholders.update(extra_context)
template = template or self.template
+ params *= template.count('%(expression)s')
return (template % placeholders).rstrip(), params
def as_sqlite(self, compiler, connection):