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

Review applied

fix_request_path_info
Krzysztof Gromadzki 2017-12-31 17:08:33 +01:00
parent 010a23425f
commit 8dc9bd2543
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
polymorphic/tests/migrations/0001_initial.py
View File

@ -1074,7 +1074,6 @@ class Migration(migrations.Migration):
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=30)), ('name', models.CharField(max_length=30)),
('weight', models.IntegerField()),
('polymorphic_ctype', ('polymorphic_ctype',
models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE,
related_name='polymorphic_tests.duck_set+', to='contenttypes.ContentType')), related_name='polymorphic_tests.duck_set+', to='contenttypes.ContentType')),
@ -1114,7 +1113,7 @@ class Migration(migrations.Migration):
to='contenttypes.ContentType'), to='contenttypes.ContentType'),
), ),
migrations.CreateModel( migrations.CreateModel(
name='ReadheadDuck', name='RedheadDuck',
fields=[ fields=[
], ],
options={ options={

3
polymorphic/tests/models.py
View File

@ -443,10 +443,9 @@ class ArtProject(AbstractProject):
class Duck(PolymorphicModel): class Duck(PolymorphicModel):
name = models.CharField(max_length=30) name = models.CharField(max_length=30)
weight = models.IntegerField()
class ReadheadDuck(Duck): class RedheadDuck(Duck):
class Meta: class Meta:
proxy = True proxy = True

25
polymorphic/tests/test_orm.py
View File

@ -68,7 +68,7 @@ from polymorphic.tests.models import (
ProxyModelB, ProxyModelB,
ProxyModelBase, ProxyModelBase,
QuerySet, QuerySet,
ReadheadDuck, RedheadDuck,
RelationA, RelationA,
RelationB, RelationB,
RelationBC, RelationBC,
@ -969,19 +969,19 @@ class PolymorphicTests(TransactionTestCase):
) )
def test_bulk_create_proxy_inheritance(self): def test_bulk_create_proxy_inheritance(self):
ReadheadDuck.objects.bulk_create([ RedheadDuck.objects.bulk_create([
ReadheadDuck(name='readheadduck1', weight=1), RedheadDuck(name='redheadduck1'),
Duck(name='duck1', weight=1), Duck(name='duck1'),
RubberDuck(name='rubberduck1', weight=1), RubberDuck(name='rubberduck1'),
]) ])
RubberDuck.objects.bulk_create([ RubberDuck.objects.bulk_create([
ReadheadDuck(name='readheadduck2', weight=1), RedheadDuck(name='redheadduck2'),
RubberDuck(name='rubberduck2', weight=1), RubberDuck(name='rubberduck2'),
Duck(name='duck2', weight=1), Duck(name='duck2'),
]) ])
self.assertEqual( self.assertEqual(
sorted(ReadheadDuck.objects.values_list('name', flat=True)), sorted(RedheadDuck.objects.values_list('name', flat=True)),
['readheadduck1', 'readheadduck2'], ['redheadduck1', 'redheadduck2'],
) )
self.assertEqual( self.assertEqual(
sorted(RubberDuck.objects.values_list('name', flat=True)), sorted(RubberDuck.objects.values_list('name', flat=True)),
@ -989,12 +989,11 @@ class PolymorphicTests(TransactionTestCase):
) )
self.assertEqual( self.assertEqual(
sorted(Duck.objects.values_list('name', flat=True)), sorted(Duck.objects.values_list('name', flat=True)),
['duck1', 'duck2', 'readheadduck1', 'readheadduck2', 'rubberduck1', 'rubberduck2'], ['duck1', 'duck2', 'redheadduck1', 'redheadduck2', 'rubberduck1', 'rubberduck2'],
) )
def test_bulk_create_unsupported_multi_table_inheritance(self): def test_bulk_create_unsupported_multi_table_inheritance(self):
expected_message = 'Can\'t bulk create a multi-table inherited model' with self.assertRaises(ValueError):
with self.assertRaisesMessage(ValueError, expected_message):
MultiTableDerived.objects.bulk_create([ MultiTableDerived.objects.bulk_create([
MultiTableDerived(field1='field1', field2='field2') MultiTableDerived(field1='field1', field2='field2')
]) ])