diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2011-08-23 06:29:01 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2011-08-23 06:29:01 +0000 |
| commit | 7182cd2284a15cd5094ab6567ae14c6ad3cd901a (patch) | |
| tree | 2fc9d986ec55a4d8636ea8e897e4375cf2bfa2fc | |
| parent | a86dde20f05cb85bb2d69c483d084e6c217792cc (diff) | |
Allow "pk" as a field alias in QuerySet.only() calls.
Thanks to GDorn for the patch. Fixed #15494.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/models/sql/query.py | 9 | ||||
| -rw-r--r-- | tests/modeltests/defer/tests.py | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index e5e11f472a..b55de3d766 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1791,13 +1791,18 @@ class Query(object): existing immediate values, but respects existing deferrals.) """ existing, defer = self.deferred_loading + field_names = set(field_names) + if 'pk' in field_names: + field_names.remove('pk') + field_names.add(self.model._meta.pk.name) + if defer: # Remove any existing deferred names from the current set before # setting the new names. - self.deferred_loading = set(field_names).difference(existing), False + self.deferred_loading = field_names.difference(existing), False else: # Replace any existing "immediate load" field names. - self.deferred_loading = set(field_names), False + self.deferred_loading = field_names, False def get_loaded_field_names(self): """ diff --git a/tests/modeltests/defer/tests.py b/tests/modeltests/defer/tests.py index 5f6c53dee2..ccf19fd5ae 100644 --- a/tests/modeltests/defer/tests.py +++ b/tests/modeltests/defer/tests.py @@ -28,11 +28,18 @@ class DeferTests(TestCase): self.assert_delayed(qs.only("name")[0], 2) self.assert_delayed(qs.defer("related__first")[0], 0) + # Using 'pk' with only() should result in 3 deferred fields, namely all + # of them except the model's primary key see #15494 + self.assert_delayed(qs.only("pk")[0], 3) + obj = qs.select_related().only("related__first")[0] self.assert_delayed(obj, 2) self.assertEqual(obj.related_id, s1.pk) + # You can use 'pk' with reverse foreign key lookups. + self.assert_delayed(s1.primary_set.all().only('pk')[0], 3) + self.assert_delayed(qs.defer("name").extra(select={"a": 1})[0], 1) self.assert_delayed(qs.extra(select={"a": 1}).defer("name")[0], 1) self.assert_delayed(qs.defer("name").defer("value")[0], 2) @@ -135,3 +142,4 @@ class DeferTests(TestCase): self.assertEqual(obj.other, "bar") obj.name = "bb" obj.save() + |