Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unit tests for defer() / only() 

Added get_deferred_fields() to ShowFieldBase
fix_request_path_info
Diederik van der Boor 2016-08-10 13:43:19 +02:00
parent dd89458615
commit 3817061467
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
polymorphic/showfields.py
View File

@ -1,9 +1,11 @@
# -*- coding: utf-8 -*-
import django
from django.db import models
from django.utils import six
from django.utils.six import python_2_unicode_compatible
@python_2_unicode_compatible
class ShowFieldBase(object):
""" base class for the ShowField... model mixins, does the work """
@ -11,6 +13,7 @@ class ShowFieldBase(object):
polymorphic_showfield_type = False
polymorphic_showfield_content = False
polymorphic_showfield_deferred = False
# these may be overridden by the user
polymorphic_showfield_max_line_width = None
@ -87,12 +90,12 @@ class ShowFieldBase(object):
parts.append((False, out, ','))
def __unicode__(self):
def __str__(self):
# create list ("parts") containing one tuple for each title/field:
# ( bool: new section , item-text , separator to use after item )
# start with model name
parts = [(True, self.__class__.__name__, ':')]
parts = [(True, self._meta.object_name, ':')]
# add all regular fields
self._showfields_add_regular_fields(parts)
@ -105,6 +108,11 @@ class ShowFieldBase(object):
if hasattr(self, 'polymorphic_extra_select_names'):
self._showfields_add_dynamic_fields(self.polymorphic_extra_select_names, 'Extra', parts)
if self.polymorphic_showfield_deferred:
fields = self.get_deferred_fields()
if fields:
parts.append((False, u"deferred[{0}]".format(",".join(sorted(fields))), ''))
# format result
indent = len(self.__class__.__name__) + 5
@ -142,6 +150,11 @@ class ShowFieldBase(object):
return '<' + out + '>'
if django.VERSION < (1, 8):
def get_deferred_fields(self):
from django.db.models import DeferredAttribute
return set(attr for attr, value in self.__class__ if isinstance(value, DeferredAttribute))
class ShowFieldType(ShowFieldBase):
""" model mixin that shows the object's class and it's field types """

29
polymorphic/tests.py
View File

@ -46,6 +46,7 @@ class PlainC(PlainB):
class Model2A(ShowFieldType, PolymorphicModel):
field1 = models.CharField(max_length=10)
polymorphic_showfield_deferred = True
class Model2B(Model2A):
@ -562,18 +563,19 @@ class PolymorphicTests(TestCase):
self.create_model2abcd()
objects_deferred = Model2A.objects.defer('field1')
self.assertNotIn('field1', objects_deferred[0].__dict__,
'field1 was not deferred (using defer())')
self.assertNotIn('field1', objects_deferred[0].__dict__, 'field1 was not deferred (using defer())')
self.assertEqual(repr(objects_deferred[0]),
'<Model2A_Deferred_field1: id 1, field1 (CharField)>')
'<Model2A: id 1, field1 (CharField), deferred[field1]>')
self.assertEqual(repr(objects_deferred[1]),
'<Model2B_Deferred_field1: id 2, field1 (CharField), field2 (CharField)>')
'<Model2B: id 2, field1 (CharField), field2 (CharField), deferred[field1]>')
self.assertEqual(repr(objects_deferred[2]),
'<Model2C_Deferred_field1: id 3, field1 (CharField), field2 (CharField), field3 (CharField)>')
'<Model2C: id 3, field1 (CharField), field2 (CharField), field3 (CharField), deferred[field1]>')
self.assertEqual(repr(objects_deferred[3]),
'<Model2D_Deferred_field1: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField)>')
'<Model2D: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField), deferred[field1]>')
objects_only = Model2A.objects.only('pk', 'polymorphic_ctype', 'field1')
self.assertIn('field1', objects_only[0].__dict__,
'qs.only("field1") was used, but field1 was incorrectly deferred')
self.assertIn('field1', objects_only[3].__dict__,
@ -584,14 +586,13 @@ class PolymorphicTests(TestCase):
self.assertEqual(repr(objects_only[0]),
'<Model2A: id 1, field1 (CharField)>')
self.assertEqual(repr(objects_only[1]),
'<Model2B_Deferred_field2: '
'id 2, field1 (CharField), field2 (CharField)>')
'<Model2B: id 2, field1 (CharField), field2 (CharField), deferred[field2]>')
self.assertEqual(repr(objects_only[2]),
'<Model2C_Deferred_field2_field3_model2a_ptr_id: '
'id 3, field1 (CharField), field2 (CharField), field3 (CharField)>')
'<Model2C: id 3, field1 (CharField), field2 (CharField), field3 (CharField), '
'deferred[field2,field3,model2a_ptr_id]>')
self.assertEqual(repr(objects_only[3]),
'<Model2D_Deferred_field2_field3_field4_model2a_ptr_id_model2b_ptr_id: '
'id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField)>')
'<Model2D: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField), '
'deferred[field2,field3,field4,model2a_ptr_id,model2b_ptr_id]>')
# A bug in Django 1.4 prevents using defer across reverse relations
# <https://code.djangoproject.com/ticket/14694>. Since polymorphic
@ -611,7 +612,7 @@ class PolymorphicTests(TestCase):
self.assertEqual(repr(objects_deferred_field4[2]),
'<Model2C: id 3, field1 (CharField), field2 (CharField), field3 (CharField)>')
self.assertEqual(repr(objects_deferred_field4[3]),
'<Model2D_Deferred_field4: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField)>')
'<Model2D: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField), deferred[field4]>')
objects_only_field4 = Model2A.objects.only(
'polymorphic_ctype', 'field1',
@ -625,7 +626,7 @@ class PolymorphicTests(TestCase):
self.assertEqual(repr(objects_only_field4[2]),
'<Model2C: id 3, field1 (CharField), field2 (CharField), field3 (CharField)>')
self.assertEqual(repr(objects_only_field4[3]),
'<Model2D_Deferred_field4: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField)>')
'<Model2D: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField), deferred[field4]>')
def test_manual_get_real_instance(self):