Fixed #17678 -- Corrected setup of _meta.proxy_for_model and added _meta.concrete_model. Thanks Anssi Kääriäinen.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Carl Meyer 2012-02-22 05:26:50 +00:00
parent 3ac0961e1e
commit 354c84d277
7 changed files with 27 additions and 29 deletions

View file

@ -7,7 +7,7 @@ from django.db.models.query_utils import select_related_descend
from django.db.models.sql.constants import *
from django.db.models.sql.datastructures import EmptyResultSet
from django.db.models.sql.expressions import SQLEvaluator
from django.db.models.sql.query import get_proxied_model, get_order_dir, Query
from django.db.models.sql.query import get_order_dir, Query
from django.db.utils import DatabaseError
@ -266,7 +266,7 @@ class SQLCompiler(object):
aliases = set()
only_load = self.deferred_to_columns()
# Skip all proxy to the root proxied model
proxied_model = get_proxied_model(opts)
proxied_model = opts.concrete_model
if start_alias:
seen = {None: start_alias}