Ticket #9961: select_related.patch

django/db/models/query.py

@@ -525 +525 @@
         If fields are specified, they must be ForeignKey fields and only those
         related objects are included in the selection.
         """
-        depth = kwargs.pop('depth', 0)
+        depth = kwargs.pop('depth', None)
         if kwargs:
             raise TypeError('Unexpected keyword arguments to select_related: %s'
                     % (kwargs.keys(),))
@@ -536 +536 @@
             obj.query.add_select_related(fields)
         else:
             obj.query.select_related = True
-        if depth:
+        if depth is not None:
             obj.query.max_depth = depth
         return obj
 
@@ -781 +781 @@
         yield iter([]).next()
 
 
-def get_cached_row(klass, row, index_start, max_depth=0, cur_depth=0,
+def get_cached_row(klass, row, index_start, max_depth=None, cur_depth=0,
                    requested=None):
     """
     Helper function that recursively returns an object with the specified
     related attributes already populated.
     """
-    if max_depth and requested is None and cur_depth > max_depth:
+    if max_depth is not None and requested is None and cur_depth > max_depth:
         # We've recursed deeply enough; stop now.
         return None
 

django/db/models/sql/query.py

@@ -953 +953 @@
         (for example, cur_depth=1 means we are looking at models with direct
         connections to the root model).
         """
-        if not restricted and self.max_depth and cur_depth > self.max_depth:
+        if not restricted and self.max_depth is not None and cur_depth > self.max_depth:
             # We've recursed far enough; bail out.
             return