p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Used @cached_property in RawQuerySet.

This commit is contained in:
Adam Chainz 2016-12-23 15:12:48 +00:00 committed by Tim Graham
parent 6ebf8f9057
commit 8d94d575f8
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
django/db/models/query.py
View File

@ -1241,38 +1241,34 @@ class RawQuerySet(object):
using=alias, using=alias,
) )
@property @cached_property
def columns(self): def columns(self):
""" """
A list of model field names in the order they'll appear in the A list of model field names in the order they'll appear in the
query results. query results.
""" """
if not hasattr(self, '_columns'): columns = self.query.get_columns()
self._columns = self.query.get_columns() # Adjust any column names which don't match field names
for (query_name, model_name) in self.translations.items():
try:
index = columns.index(query_name)
columns[index] = model_name
except ValueError:
# Ignore translations for non-existent column names
pass
return columns
# Adjust any column names which don't match field names @cached_property
for (query_name, model_name) in self.translations.items():
try:
index = self._columns.index(query_name)
self._columns[index] = model_name
except ValueError:
# Ignore translations for non-existent column names
pass
return self._columns
@property
def model_fields(self): def model_fields(self):
""" """
A dict mapping column names to model field names. A dict mapping column names to model field names.
""" """
if not hasattr(self, '_model_fields'): converter = connections[self.db].introspection.table_name_converter
converter = connections[self.db].introspection.table_name_converter model_fields = {}
self._model_fields = {} for field in self.model._meta.fields:
for field in self.model._meta.fields: name, column = field.get_attname_column()
name, column = field.get_attname_column() model_fields[converter(column)] = field
self._model_fields[converter(column)] = field return model_fields
return self._model_fields
class Prefetch(object): class Prefetch(object):