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

Removed unused with_filtered_relation argument from .equals() 

Unused since bbf141bcdc.
This commit is contained in:
Nick Pope 2021-02-08 11:48:06 +00:00 committed by Mariusz Felisiak
parent 68e876c095
commit a6c79f4987
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/db/models/sql/datastructures.py
View File

@ -132,9 +132,8 @@ class Join:
def __hash__(self): def __hash__(self):
return hash(self.identity) return hash(self.identity)
def equals(self, other, with_filtered_relation): def equals(self, other):
if with_filtered_relation: # Ignore filtered_relation in equality check.
return self == other
return self.identity[:-1] == other.identity[:-1] return self.identity[:-1] == other.identity[:-1]
def demote(self): def demote(self):
@ -183,5 +182,5 @@ class BaseTable:
def __hash__(self): def __hash__(self):
return hash(self.identity) return hash(self.identity)
def equals(self, other, with_filtered_relation): def equals(self, other):
return self.identity == other.identity return self.identity == other.identity

2
django/db/models/sql/query.py
View File

@ -967,7 +967,7 @@ class Query(BaseExpression):
if reuse_with_filtered_relation and reuse: if reuse_with_filtered_relation and reuse:
reuse_aliases = [ reuse_aliases = [
a for a, j in self.alias_map.items() a for a, j in self.alias_map.items()
if a in reuse and j.equals(join, with_filtered_relation=False) if a in reuse and j.equals(join)
] ]
else: else:
reuse_aliases = [ reuse_aliases = [