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:39:57 -0500
commit75c1fd653858997449f7ac47a3f3379723bbfc73 (patch)
tree4d60de168e953599baefc5df5e31b6a4d2705790 /django
parenta11b6103253e801e8f0d6cf41ed15ddb8adecc77 (diff)
[2.0.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 edc3c4fd3e..9ada4ded6d 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -1118,6 +1118,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):