From 72f9b7d4e84cf288e86255d2f61a4343e2a65026 Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Sun, 14 Oct 2007 02:13:04 +0000
Subject: [PATCH] queryset-refactor: integrate select_related() into SQL
 generation.

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/models/sql/query.py             | 11 +++++++----
 tests/modeltests/select_related/models.py |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index db3ece3047..9f5030cf93 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -315,6 +315,8 @@ class Query(object):
         """
         if not self.tables:
             self.join((None, self.model._meta.db_table, None, None))
+        if self.select_related:
+            self.fill_related_selections()
 
     def get_columns(self):
         """
@@ -489,7 +491,7 @@ class Query(object):
         self.rev_join_map[alias] = t_ident
         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):
         """
         Fill in the information needed for a select_related query.
@@ -500,7 +502,7 @@ class Query(object):
         if not opts:
             opts = self.model._meta
             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:
             used = []
 
@@ -509,11 +511,12 @@ class Query(object):
                 continue
             table = f.rel.to._meta.db_table
             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)
             self.select.extend([(table, f2.column)
                     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):
         """
diff --git a/tests/modeltests/select_related/models.py b/tests/modeltests/select_related/models.py
index 43efab3a7d..ae925b5263 100644
--- a/tests/modeltests/select_related/models.py
+++ b/tests/modeltests/select_related/models.py
@@ -27,13 +27,13 @@ class Phylum(models.Model):
     kingdom = models.ForeignKey(Kingdom)
     def __unicode__(self):
         return self.name
-    
+
 class Klass(models.Model):
     name = models.CharField(max_length=50)
     phylum = models.ForeignKey(Phylum)
     def __unicode__(self):
         return self.name
-    
+
 class Order(models.Model):
     name = models.CharField(max_length=50)
     klass = models.ForeignKey(Klass)
@@ -63,7 +63,7 @@ def create_tree(stringtree):
     names = stringtree.split()
     models = [Domain, Kingdom, Phylum, Klass, Order, Family, Genus, Species]
     assert len(names) == len(models), (names, models)
-    
+
     parent = None
     for name, model in zip(names, models):
         try: