diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-03-20 15:42:18 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-03-20 15:42:18 +0000 |
| commit | 4d00ac86eea3c4df7b11a9ca195ea69426e70f6a (patch) | |
| tree | a7499cdfccfe3145e9f8b876ebb0417942749d9f /django | |
| parent | eb1c7b033ddac99b333407ba0b964831aa5ef9c4 (diff) | |
[1.1.X] Fixed #12851 -- Corrected the interaction of defer() with select_related(). Thanks to ruosteinen for the report.
Backport of r12817 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 9c3cf48e88..e021fd317e 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -996,7 +996,7 @@ def get_cached_row(klass, row, index_start, max_depth=0, cur_depth=0, else: next = None cached_row = get_cached_row(f.rel.to, row, index_end, max_depth, - cur_depth+1, next) + cur_depth+1, next, only_load=only_load) if cached_row: rel_obj, index_end = cached_row if obj is not None: |