[1.0.X] Fixed #10251 -- Fixed model inheritance when there's also an explicit pk field.

Backport of r9970 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9972 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 4 deletions

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index c8c25bd711..550e6e323c 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -494,14 +494,14 @@ class BaseQuery(object):
         aliases = set()
         if start_alias:
             seen = {None: start_alias}
-            root_pk = opts.pk.column
         for field, model in opts.get_fields_with_model():
             if start_alias:
                 try:
                     alias = seen[model]
                 except KeyError:
+                    link_field = opts.get_ancestor_link(model)
                     alias = self.join((start_alias, model._meta.db_table,
-                            root_pk, model._meta.pk.column))
+                            link_field.column, model._meta.pk.column))
                     seen[model] = alias
             else:
                 # If we're starting from the base model of the queryset, the
@@ -1005,13 +1005,13 @@ class BaseQuery(object):
         as_sql()).
         """
         opts = self.model._meta
-        root_pk = opts.pk.column
         root_alias = self.tables[0]
         seen = {None: root_alias}
         for field, model in opts.get_fields_with_model():
             if model not in seen:
+                link_field = opts.get_ancestor_link(model)
                 seen[model] = self.join((root_alias, model._meta.db_table,
-                        root_pk, model._meta.pk.column))
+                        link_field.column, model._meta.pk.column))
         self.included_inherited_models = seen
 
     def remove_inherited_models(self):