innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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>
This commit is contained in:
Keryn Knight 2021-07-07 19:32:57 +01:00 committed by GitHub
parent 355ecd1416
commit 5013798fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/models/fields/__init__.py
View File

@ -392,13 +392,13 @@ class Field(RegisterLookupMixin):
return [] return []
def get_col(self, alias, output_field=None): def get_col(self, alias, output_field=None):
if output_field is None: if (
output_field = self alias == self.model._meta.db_table and
if alias != self.model._meta.db_table or output_field != self: (output_field is None or output_field == self)
from django.db.models.expressions import Col ):
return Col(alias, self, output_field)
else:
return self.cached_col return self.cached_col
from django.db.models.expressions import Col
return Col(alias, self, output_field)
@cached_property @cached_property
def cached_col(self): def cached_col(self):