mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 10:49:17 +00:00
Code Issues 32 Releases Wiki Activity

queryset-refactor: integrate select_related() into SQL generation.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-10-14 02:13:04 +00:00
parent 988b3bbdcb
commit 72f9b7d4e8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,6 +315,8 @@ class Query(object):
""" """
if not self.tables: if not self.tables:
self.join((None, self.model._meta.db_table, None, None)) self.join((None, self.model._meta.db_table, None, None))
if self.select_related:
self.fill_related_selections()
def get_columns(self): def get_columns(self):
""" """
@ -489,7 +491,7 @@ class Query(object):
self.rev_join_map[alias] = t_ident self.rev_join_map[alias] = t_ident
return alias return alias
def fill_table_cache(self, opts=None, root_alias=None, cur_depth=0, def fill_related_selections(self, opts=None, root_alias=None, cur_depth=0,
used=None): used=None):
""" """
Fill in the information needed for a select_related query. Fill in the information needed for a select_related query.
@ -500,7 +502,7 @@ class Query(object):
if not opts: if not opts:
opts = self.model._meta opts = self.model._meta
root_alias = self.tables[0] root_alias = self.tables[0]
self.select.extend([(root_alias, f) for f in opts.fields]) self.select.extend([(root_alias, f.column) for f in opts.fields])
if not used: if not used:
used = [] used = []
@ -509,11 +511,12 @@ class Query(object):
continue continue
table = f.rel.to._meta.db_table table = f.rel.to._meta.db_table
alias = self.join((root_alias, table, f.column, alias = self.join((root_alias, table, f.column,
f.rel.get_related_field().column), exclusion=used) f.rel.get_related_field().column), exclusions=used)
used.append(alias) used.append(alias)
self.select.extend([(table, f2.column) self.select.extend([(table, f2.column)
for f2 in f.rel.to._meta.fields]) for f2 in f.rel.to._meta.fields])
self.fill_table_cache(f.rel.to._meta, alias, cur_depth + 1, used) self.fill_related_selections(f.rel.to._meta, alias, cur_depth + 1,
used)
def add_filter(self, filter_expr, connection=AND, negate=False): def add_filter(self, filter_expr, connection=AND, negate=False):
""" """

6
tests/modeltests/select_related/models.py
View File

@ -27,13 +27,13 @@ class Phylum(models.Model):
kingdom = models.ForeignKey(Kingdom) kingdom = models.ForeignKey(Kingdom)
def __unicode__(self): def __unicode__(self):
return self.name return self.name
class Klass(models.Model): class Klass(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
phylum = models.ForeignKey(Phylum) phylum = models.ForeignKey(Phylum)
def __unicode__(self): def __unicode__(self):
return self.name return self.name
class Order(models.Model): class Order(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
klass = models.ForeignKey(Klass) klass = models.ForeignKey(Klass)
@ -63,7 +63,7 @@ def create_tree(stringtree):
names = stringtree.split() names = stringtree.split()
models = [Domain, Kingdom, Phylum, Klass, Order, Family, Genus, Species] models = [Domain, Kingdom, Phylum, Klass, Order, Family, Genus, Species]
assert len(names) == len(models), (names, models) assert len(names) == len(models), (names, models)
parent = None parent = None
for name, model in zip(names, models): for name, model in zip(names, models):
try: try: