From 5013798fe9a87b693ddb5589a8a408a04a873781 Mon Sep 17 00:00:00 2001 From: Keryn Knight Date: Wed, 7 Jul 2021 19:32:57 +0100 Subject: [PATCH] Fixed #32840 -- Optimized Field.get_col(). get_col() used "self" as "output_field" when it was not given, and unnecessarily compared "self" to "self". Co-authored-by: Chris Jerdonek Co-authored-by: Mariusz Felisiak --- django/db/models/fields/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index d7e19ad25b..84c81f9e21 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -392,13 +392,13 @@ class Field(RegisterLookupMixin): return [] def get_col(self, alias, output_field=None): - if output_field is None: - output_field = self - if alias != self.model._meta.db_table or output_field != self: - from django.db.models.expressions import Col - return Col(alias, self, output_field) - else: + if ( + alias == self.model._meta.db_table and + (output_field is None or output_field == self) + ): return self.cached_col + from django.db.models.expressions import Col + return Col(alias, self, output_field) @cached_property def cached_col(self):