summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
authorcan <cansarigol@derinbilgi.com.tr>2019-03-27 21:18:18 +0300
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-06-19 12:11:28 +0200
commit2cbd3967e0a51eab993df89679046d25ec78baec (patch)
treecedea9d8ad0c88e078e924f9578b83b70f0e0be7 /django/db/models/sql/query.py
parent14d026cccb144c6877294ba4cd4e03ebf0842498 (diff)
Fixed #29834 -- Fixed column mismatch crash with QuerySet.values()/values_list() and order_by() on combined querysets.
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 08d7faf194..fc08442193 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1774,6 +1774,10 @@ class Query(BaseExpression):
self.select = ()
self.values_select = ()
+ def add_select_col(self, col):
+ self.select += col,
+ self.values_select += col.output_field.name,
+
def set_select(self, cols):
self.default_cols = False
self.select = tuple(cols)