Browse files

Factored out a semi-complex if-test that was used in two places.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent a8fa3fd commit 5326cd293ef39408c325d592afdb87cb432007bd @malcolmt malcolmt committed Jun 29, 2008
Showing with 22 additions and 6 deletions.
  1. +2 −3 django/db/models/
  2. +17 −0 django/db/models/
  3. +3 −3 django/db/models/sql/
@@ -3,7 +3,7 @@
from django.conf import settings
from django.db import connection, transaction, IntegrityError
from django.db.models.fields import DateField, FieldDoesNotExist
-from django.db.models.query_utils import Q
+from django.db.models.query_utils import Q, select_related_descend
from django.db.models import signals, sql
from django.dispatch import dispatcher
from django.utils.datastructures import SortedDict
@@ -761,8 +761,7 @@ def get_cached_row(klass, row, index_start, max_depth=0, cur_depth=0,
index_end = index_start + len(klass._meta.fields)
obj = klass(*row[index_start:index_end])
for f in klass._meta.fields:
- if (not f.rel or (not restricted and f.null) or
- (restricted and not in requested) or f.rel.parent_link):
+ if not select_related_descend(f, restricted, requested):
if restricted:
next = requested[]
@@ -48,3 +48,20 @@ def __invert__(self):
return obj
+def select_related_descend(field, restricted, requested):
+ """
+ Returns True if this field should be used to descend deeper for
+ select_related() purposes. Used by both the query construction code
+ (sql.query.fill_related_selections()) and the model instance creation code
+ (query.get_cached_row()).
+ """
+ if not field.rel:
+ return False
+ if field.rel.parent_link:
+ return False
+ if restricted and not in requested:
+ return False
+ if not restricted and field.null:
+ return False
+ return True
@@ -15,9 +15,10 @@
from django.dispatch import dispatcher
from django.db import connection
from django.db.models import signals
+from django.db.models.fields import FieldDoesNotExist
+from django.db.models.query_utils import select_related_descend
from django.db.models.sql.where import WhereNode, EverythingNode, AND, OR
from django.db.models.sql.datastructures import Count
-from django.db.models.fields import FieldDoesNotExist
from django.core.exceptions import FieldError
from datastructures import EmptyResultSet, Empty, MultiJoin
from constants import *
@@ -915,8 +916,7 @@ def fill_related_selections(self, opts=None, root_alias=None, cur_depth=1,
restricted = False
for f, model in opts.get_fields_with_model():
- if (not f.rel or (restricted and not in requested) or
- (not restricted and f.null) or f.rel.parent_link):
+ if not select_related_descend(f, restricted, requested):
dupe_set = orig_dupe_set.copy()
used = orig_used.copy()

0 comments on commit 5326cd2

Please sign in to comment.