From 9972a101e60d1c4bf1e0b6f3c7946c8716022711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anssi=20K=C3=A4=C3=A4ri=C3=A4inen?= <akaariai@gmail.com>
Date: Tue, 1 Oct 2013 11:07:41 +0300
Subject: [PATCH] [1.6.x] Fixed #21203 -- resolve_columns fields misalignment
In queries using .defer() together with .select_related() the values
and fields arguments didn't align properly for resolve_columns().
Backpatch of bf13c75c0d94d606b8a077ff73bbd0440f05b396 from master.
---
django/db/models/sql/compiler.py | 5 ++---
tests/queries/models.py | 9 +++++++++
tests/queries/tests.py | 12 ++++++++++--
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 8ec624b2e6..e571ef2222 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -736,9 +736,8 @@ class SQLCompiler(object):
# into `resolve_columns` because it wasn't selected.
only_load = self.deferred_to_columns()
if only_load:
- db_table = self.query.get_meta().db_table
- fields = [f for f in fields if db_table in only_load and
- f.column in only_load[db_table]]
+ fields = [f for f in fields if f.model._meta.db_table not in only_load or
+ f.column in only_load[f.model._meta.db_table]]
if has_aggregate_select:
# pad None in to fields for aggregates
fields = fields[:aggregate_start] + [
diff --git a/tests/queries/models.py b/tests/queries/models.py
index 99c04a1c9b..6d9e35d0bf 100644
--- a/tests/queries/models.py
+++ b/tests/queries/models.py
@@ -527,3 +527,12 @@ class StaffUser(BaseUser):
def __str__(self):
return self.staff
+
+class Ticket21203Parent(models.Model):
+ parentid = models.AutoField(primary_key=True)
+ parent_bool = models.BooleanField(default=True)
+ created = models.DateTimeField(auto_now=True)
+
+class Ticket21203Child(models.Model):
+ childid = models.AutoField(primary_key=True)
+ parent = models.ForeignKey(Ticket21203Parent)
diff --git a/tests/queries/tests.py b/tests/queries/tests.py
index d99b531af7..ec708c6a51 100644
--- a/tests/queries/tests.py
+++ b/tests/queries/tests.py
@@ -26,8 +26,8 @@ from .models import (
OneToOneCategory, NullableName, ProxyCategory, SingleObject, RelatedObject,
ModelA, ModelB, ModelC, ModelD, Responsibility, Job, JobResponsibilities,
BaseA, FK1, Identifier, Program, Channel, Page, Paragraph, Chapter, Book,
- MyObject, Order, OrderItem, Task, Staff, StaffUser)
-
+ MyObject, Order, OrderItem, Task, Staff, StaffUser, Ticket21203Parent,
+ Ticket21203Child)
class BaseQuerysetTest(TestCase):
def assertValueQuerysetEqual(self, qs, values):
@@ -3000,3 +3000,11 @@ class Ticket20955Tests(TestCase):
task_get.creator.staffuser.staff)
self.assertEqual(task_select_related.owner.staffuser.staff,
task_get.owner.staffuser.staff)
+
+class Ticket21203Tests(TestCase):
+ def test_ticket_21203(self):
+ p = Ticket21203Parent.objects.create(parent_bool=True)
+ c = Ticket21203Child.objects.create(parent=p)
+ qs = Ticket21203Child.objects.select_related('parent').defer('parent__created')
+ self.assertQuerysetEqual(qs, [c], lambda x: x)
+ self.assertIs(qs[0].parent.parent_bool, True)