diff options
| author | Keryn Knight <keryn@kerynknight.com> | 2021-07-07 19:32:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-07 20:32:57 +0200 |
| commit | 5013798fe9a87b693ddb5589a8a408a04a873781 (patch) | |
| tree | aabd068383202845c01344d8b6c635641e955df4 | |
| parent | 355ecd141671e34853d1ff99ffdb1a7fb95b4276 (diff) | |
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 <chris.jerdonek@gmail.com>
Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
| -rw-r--r-- | django/db/models/fields/__init__.py | 12 |
1 files 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): |