mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-13 10:50:55 +00:00
Code Issues 32 Releases Wiki Activity

Refs #373 -- Refactored variable assignments in ColPairs and tuple lookups.

Browse Source
This commit is contained in:
Bendeguz Csirmaz 2024-09-10 23:09:16 +08:00 committed by Sarah Boyce
parent 347ab72c02
commit 727587c089
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/expressions.py
View File

@ -1332,7 +1332,9 @@ class Col(Expression):
class ColPairs(Expression): class ColPairs(Expression):
def __init__(self, alias, targets, sources, output_field): def __init__(self, alias, targets, sources, output_field):
super().__init__(output_field=output_field) super().__init__(output_field=output_field)
self.alias, self.targets, self.sources = alias, targets, sources self.alias = alias
self.targets = targets
self.sources = sources
def __len__(self): def __len__(self):
return len(self.targets) return len(self.targets)

36
django/db/models/fields/tuple_lookups.py
View File

@ -83,12 +83,15 @@ class TupleGreaterThan(TupleLookupMixin, GreaterThan):
vals_list = [val for val in self.rhs for _ in range(2)] vals_list = [val for val in self.rhs for _ in range(2)]
cols_iter = iter(cols_list[:-1]) cols_iter = iter(cols_list[:-1])
vals_iter = iter(vals_list[:-1]) vals_iter = iter(vals_list[:-1])
col, val = next(cols_iter), next(vals_iter) col = next(cols_iter)
lookup, connector = next(lookups), next(connectors) val = next(vals_iter)
lookup = next(lookups)
connector = next(connectors)
root = node = WhereNode([lookup(col, val)], connector=connector) root = node = WhereNode([lookup(col, val)], connector=connector)
for col, val in zip(cols_iter, vals_iter): for col, val in zip(cols_iter, vals_iter):
lookup, connector = next(lookups), next(connectors) lookup = next(lookups)
connector = next(connectors)
child = WhereNode([lookup(col, val)], connector=connector) child = WhereNode([lookup(col, val)], connector=connector)
node.children.append(child) node.children.append(child)
node = child node = child
@ -107,12 +110,15 @@ class TupleGreaterThanOrEqual(TupleLookupMixin, GreaterThanOrEqual):
vals_list = [val for val in self.rhs for _ in range(2)] vals_list = [val for val in self.rhs for _ in range(2)]
cols_iter = iter(cols_list) cols_iter = iter(cols_list)
vals_iter = iter(vals_list) vals_iter = iter(vals_list)
col, val = next(cols_iter), next(vals_iter) col = next(cols_iter)
lookup, connector = next(lookups), next(connectors) val = next(vals_iter)
lookup = next(lookups)
connector = next(connectors)
root = node = WhereNode([lookup(col, val)], connector=connector) root = node = WhereNode([lookup(col, val)], connector=connector)
for col, val in zip(cols_iter, vals_iter): for col, val in zip(cols_iter, vals_iter):
lookup, connector = next(lookups), next(connectors) lookup = next(lookups)
connector = next(connectors)
child = WhereNode([lookup(col, val)], connector=connector) child = WhereNode([lookup(col, val)], connector=connector)
node.children.append(child) node.children.append(child)
node = child node = child
@ -131,12 +137,15 @@ class TupleLessThan(TupleLookupMixin, LessThan):
vals_list = [val for val in self.rhs for _ in range(2)] vals_list = [val for val in self.rhs for _ in range(2)]
cols_iter = iter(cols_list[:-1]) cols_iter = iter(cols_list[:-1])
vals_iter = iter(vals_list[:-1]) vals_iter = iter(vals_list[:-1])
col, val = next(cols_iter), next(vals_iter) col = next(cols_iter)
lookup, connector = next(lookups), next(connectors) val = next(vals_iter)
lookup = next(lookups)
connector = next(connectors)
root = node = WhereNode([lookup(col, val)], connector=connector) root = node = WhereNode([lookup(col, val)], connector=connector)
for col, val in zip(cols_iter, vals_iter): for col, val in zip(cols_iter, vals_iter):
lookup, connector = next(lookups), next(connectors) lookup = next(lookups)
connector = next(connectors)
child = WhereNode([lookup(col, val)], connector=connector) child = WhereNode([lookup(col, val)], connector=connector)
node.children.append(child) node.children.append(child)
node = child node = child
@ -155,12 +164,15 @@ class TupleLessThanOrEqual(TupleLookupMixin, LessThanOrEqual):
vals_list = [val for val in self.rhs for _ in range(2)] vals_list = [val for val in self.rhs for _ in range(2)]
cols_iter = iter(cols_list) cols_iter = iter(cols_list)
vals_iter = iter(vals_list) vals_iter = iter(vals_list)
col, val = next(cols_iter), next(vals_iter) col = next(cols_iter)
lookup, connector = next(lookups), next(connectors) val = next(vals_iter)
lookup = next(lookups)
connector = next(connectors)
root = node = WhereNode([lookup(col, val)], connector=connector) root = node = WhereNode([lookup(col, val)], connector=connector)
for col, val in zip(cols_iter, vals_iter): for col, val in zip(cols_iter, vals_iter):
lookup, connector = next(lookups), next(connectors) lookup = next(lookups)
connector = next(connectors)
child = WhereNode([lookup(col, val)], connector=connector) child = WhereNode([lookup(col, val)], connector=connector)
node.children.append(child) node.children.append(child)
node = child node = child