diff options
| author | Tim Graham <timograham@gmail.com> | 2016-10-13 14:35:10 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-10-13 14:35:10 -0400 |
| commit | 419de7b00daabf5e9be064198d370cdbf19b5f2d (patch) | |
| tree | 325f7c42b1143839c97c59d1ee980e2c5dc7a269 | |
| parent | ad332e5ca9503bba2e14cc8c3ca675eed56d72bc (diff) | |
Removed unused branch in Query.change_aliases().
Unused since 0c7633178fa9410f102e4708cef979b873bccb76.
| -rw-r--r-- | django/db/models/sql/query.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 408b697b48..6cdba87d06 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -784,21 +784,15 @@ class Query(object): """ assert set(change_map.keys()).intersection(set(change_map.values())) == set() - def relabel_column(col): - if isinstance(col, (list, tuple)): - old_alias = col[0] - return (change_map.get(old_alias, old_alias), col[1]) - else: - return col.relabeled_clone(change_map) # 1. Update references in "select" (normal columns plus aliases), # "group by" and "where". self.where.relabel_aliases(change_map) if isinstance(self.group_by, list): - self.group_by = [relabel_column(col) for col in self.group_by] + self.group_by = [col.relabeled_clone(change_map) for col in self.group_by] self.select = [col.relabeled_clone(change_map) for col in self.select] if self._annotations: self._annotations = OrderedDict( - (key, relabel_column(col)) for key, col in self._annotations.items()) + (key, col.relabeled_clone(change_map)) for key, col in self._annotations.items()) # 2. Rename the alias in the internal table/alias datastructures. for old_alias, new_alias in six.iteritems(change_map): |
