diff options
| author | David-Wobrock <david.wobrock@gmail.com> | 2020-10-10 17:41:13 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-11-14 10:22:09 +0100 |
| commit | 464a4c0c59277056b5d3c1132ac1b4c6085aee08 (patch) | |
| tree | 43b1dd15ddbb2a20c885cc1cb55add65265be24c /django/db/models/sql/query.py | |
| parent | 300def5c344c65df4bcf1f5141c886da93c41ed1 (diff) | |
Fixed #31496 -- Fixed QuerySet.values()/values_list() crash on combined querysets ordered by annotations.
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index a7dadf5a40..5a7dc25fd9 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1881,9 +1881,9 @@ class Query(BaseExpression): self.select = () self.values_select = () - def add_select_col(self, col): + def add_select_col(self, col, name): self.select += col, - self.values_select += col.output_field.name, + self.values_select += name, def set_select(self, cols): self.default_cols = False |