mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-12 02:12:38 +00:00
Code Issues 32 Releases Wiki Activity

Refs #25265 -- Allowed customizing Query's datastructure classes.

Browse Source
This commit is contained in:
Erik Cederstrand 2021-10-13 07:33:10 +02:00 committed by Mariusz Felisiak
parent dfdf1c6864
commit 547656c850
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,6 +148,9 @@ class Query(BaseExpression):
compiler = 'SQLCompiler' compiler = 'SQLCompiler'
base_table_class = BaseTable
join_class = Join
def __init__(self, model, alias_cols=True): def __init__(self, model, alias_cols=True):
self.model = model self.model = model
self.alias_refcount = {} self.alias_refcount = {}
@ -934,7 +937,7 @@ class Query(BaseExpression):
alias = self.base_table alias = self.base_table
self.ref_alias(alias) self.ref_alias(alias)
else: else:
alias = self.join(BaseTable(self.get_meta().db_table, None)) alias = self.join(self.base_table_class(self.get_meta().db_table, None))
return alias return alias
def count_active_tables(self): def count_active_tables(self):
@ -948,8 +951,8 @@ class Query(BaseExpression):
def join(self, join, reuse=None): def join(self, join, reuse=None):
""" """
Return an alias for the 'join', either reusing an existing alias for Return an alias for the 'join', either reusing an existing alias for
that join or creating a new one. 'join' is either a that join or creating a new one. 'join' is either a base_table_class or
sql.datastructures.BaseTable or Join. join_class.
The 'reuse' parameter can be either None which means all joins are The 'reuse' parameter can be either None which means all joins are
reusable, or it can be a set containing the aliases that can be reused. reusable, or it can be a set containing the aliases that can be reused.
@ -1651,7 +1654,7 @@ class Query(BaseExpression):
nullable = self.is_nullable(join.join_field) nullable = self.is_nullable(join.join_field)
else: else:
nullable = True nullable = True
connection = Join( connection = self.join_class(
opts.db_table, alias, table_alias, INNER, join.join_field, opts.db_table, alias, table_alias, INNER, join.join_field,
nullable, filtered_relation=filtered_relation, nullable, filtered_relation=filtered_relation,
) )
@ -2319,11 +2322,15 @@ class Query(BaseExpression):
# values in select_fields. Lets punt this one for now. # values in select_fields. Lets punt this one for now.
select_fields = [r[1] for r in join_field.related_fields] select_fields = [r[1] for r in join_field.related_fields]
select_alias = lookup_tables[trimmed_paths] select_alias = lookup_tables[trimmed_paths]
# The found starting point is likely a Join instead of a BaseTable reference. # The found starting point is likely a join_class instead of a
# But the first entry in the query's FROM clause must not be a JOIN. # base_table_class reference. But the first entry in the query's FROM
# clause must not be a JOIN.
for table in self.alias_map: for table in self.alias_map:
if self.alias_refcount[table] > 0: if self.alias_refcount[table] > 0:
self.alias_map[table] = BaseTable(self.alias_map[table].table_name, table) self.alias_map[table] = self.base_table_class(
self.alias_map[table].table_name,
table,
)
break break
self.set_select([f.get_col(select_alias) for f in select_fields]) self.set_select([f.get_col(select_alias) for f in select_fields])
return trimmed_prefix, contains_louter return trimmed_prefix, contains_louter