Fixed #13700 -- Converted m2m_through_regress tests to unittests, removing another flush call. Thanks to Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
parent
be63b3ca54
commit
1a6da249c3
|
|
@ -1,8 +1,10 @@
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.core import management
|
from django.core import management
|
||||||
from django.db import models
|
from django.db import models
|
||||||
|
|
||||||
|
|
||||||
# Forward declared intermediate model
|
# Forward declared intermediate model
|
||||||
class Membership(models.Model):
|
class Membership(models.Model):
|
||||||
person = models.ForeignKey('Person')
|
person = models.ForeignKey('Person')
|
||||||
|
|
@ -51,159 +53,3 @@ class Through(ThroughBase):
|
||||||
class B(models.Model):
|
class B(models.Model):
|
||||||
b_text = models.CharField(max_length=20)
|
b_text = models.CharField(max_length=20)
|
||||||
a_list = models.ManyToManyField(A, through=Through)
|
a_list = models.ManyToManyField(A, through=Through)
|
||||||
|
|
||||||
|
|
||||||
__test__ = {'API_TESTS':"""
|
|
||||||
# Create some dummy data
|
|
||||||
>>> bob = Person.objects.create(name='Bob')
|
|
||||||
>>> jim = Person.objects.create(name='Jim')
|
|
||||||
|
|
||||||
>>> rock = Group.objects.create(name='Rock')
|
|
||||||
>>> roll = Group.objects.create(name='Roll')
|
|
||||||
|
|
||||||
>>> frank = User.objects.create_user('frank','frank@example.com','password')
|
|
||||||
>>> jane = User.objects.create_user('jane','jane@example.com','password')
|
|
||||||
|
|
||||||
# Now test that the forward declared Membership works
|
|
||||||
>>> Membership.objects.create(person=bob, group=rock)
|
|
||||||
<Membership: Bob is a member of Rock>
|
|
||||||
|
|
||||||
>>> Membership.objects.create(person=bob, group=roll)
|
|
||||||
<Membership: Bob is a member of Roll>
|
|
||||||
|
|
||||||
>>> Membership.objects.create(person=jim, group=rock)
|
|
||||||
<Membership: Jim is a member of Rock>
|
|
||||||
|
|
||||||
>>> bob.group_set.all()
|
|
||||||
[<Group: Rock>, <Group: Roll>]
|
|
||||||
|
|
||||||
>>> roll.members.all()
|
|
||||||
[<Person: Bob>]
|
|
||||||
|
|
||||||
# Error messages use the model name, not repr of the class name
|
|
||||||
>>> bob.group_set = []
|
|
||||||
Traceback (most recent call last):
|
|
||||||
...
|
|
||||||
AttributeError: Cannot set values on a ManyToManyField which specifies an intermediary model. Use m2m_through_regress.Membership's Manager instead.
|
|
||||||
|
|
||||||
>>> roll.members = []
|
|
||||||
Traceback (most recent call last):
|
|
||||||
...
|
|
||||||
AttributeError: Cannot set values on a ManyToManyField which specifies an intermediary model. Use m2m_through_regress.Membership's Manager instead.
|
|
||||||
|
|
||||||
>>> rock.members.create(name='Anne')
|
|
||||||
Traceback (most recent call last):
|
|
||||||
...
|
|
||||||
AttributeError: Cannot use create() on a ManyToManyField which specifies an intermediary model. Use m2m_through_regress.Membership's Manager instead.
|
|
||||||
|
|
||||||
>>> bob.group_set.create(name='Funk')
|
|
||||||
Traceback (most recent call last):
|
|
||||||
...
|
|
||||||
AttributeError: Cannot use create() on a ManyToManyField which specifies an intermediary model. Use m2m_through_regress.Membership's Manager instead.
|
|
||||||
|
|
||||||
# Now test that the intermediate with a relationship outside
|
|
||||||
# the current app (i.e., UserMembership) workds
|
|
||||||
>>> UserMembership.objects.create(user=frank, group=rock)
|
|
||||||
<UserMembership: frank is a user and member of Rock>
|
|
||||||
|
|
||||||
>>> UserMembership.objects.create(user=frank, group=roll)
|
|
||||||
<UserMembership: frank is a user and member of Roll>
|
|
||||||
|
|
||||||
>>> UserMembership.objects.create(user=jane, group=rock)
|
|
||||||
<UserMembership: jane is a user and member of Rock>
|
|
||||||
|
|
||||||
>>> frank.group_set.all()
|
|
||||||
[<Group: Rock>, <Group: Roll>]
|
|
||||||
|
|
||||||
>>> roll.user_members.all()
|
|
||||||
[<User: frank>]
|
|
||||||
|
|
||||||
# Regression test for #8134 --
|
|
||||||
# m2m-through models shouldn't be serialized as m2m fields on the model.
|
|
||||||
|
|
||||||
# First, clean up a lot of objects we don't need.
|
|
||||||
# The serialization test only requires three objects to work -
|
|
||||||
# one for each end of the m2m, plus the through model.
|
|
||||||
|
|
||||||
>>> User.objects.all().delete()
|
|
||||||
>>> UserMembership.objects.all().delete()
|
|
||||||
>>> frank.delete()
|
|
||||||
>>> rock.delete()
|
|
||||||
>>> jim.delete()
|
|
||||||
|
|
||||||
# Dump the current contents of the database as a JSON fixture
|
|
||||||
>>> management.call_command('dumpdata', 'm2m_through_regress', format='json', indent=2)
|
|
||||||
[
|
|
||||||
{
|
|
||||||
"pk": 2,
|
|
||||||
"model": "m2m_through_regress.membership",
|
|
||||||
"fields": {
|
|
||||||
"person": 1,
|
|
||||||
"price": 100,
|
|
||||||
"group": 2
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pk": 1,
|
|
||||||
"model": "m2m_through_regress.person",
|
|
||||||
"fields": {
|
|
||||||
"name": "Bob"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pk": 2,
|
|
||||||
"model": "m2m_through_regress.group",
|
|
||||||
"fields": {
|
|
||||||
"name": "Roll"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
|
|
||||||
# Check the XML serializer too, since it doesn't use the common implementation
|
|
||||||
>>> management.call_command('dumpdata', 'm2m_through_regress', format='xml', indent=2)
|
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<django-objects version="1.0">
|
|
||||||
<object pk="2" model="m2m_through_regress.membership">
|
|
||||||
<field to="m2m_through_regress.person" name="person" rel="ManyToOneRel">1</field>
|
|
||||||
<field to="m2m_through_regress.group" name="group" rel="ManyToOneRel">2</field>
|
|
||||||
<field type="IntegerField" name="price">100</field>
|
|
||||||
</object>
|
|
||||||
<object pk="1" model="m2m_through_regress.person">
|
|
||||||
<field type="CharField" name="name">Bob</field>
|
|
||||||
</object>
|
|
||||||
<object pk="2" model="m2m_through_regress.group">
|
|
||||||
<field type="CharField" name="name">Roll</field>
|
|
||||||
</object>
|
|
||||||
</django-objects>
|
|
||||||
|
|
||||||
## Regression test for #8046:
|
|
||||||
Check that we don't involve too many copies of the intermediate table when
|
|
||||||
doing a join.
|
|
||||||
|
|
||||||
>>> bob = Person.objects.create(name='Bob')
|
|
||||||
>>> jim = Person.objects.create(name='Jim')
|
|
||||||
>>> rock = Group.objects.create(name='Rock')
|
|
||||||
>>> roll = Group.objects.create(name='Roll')
|
|
||||||
>>> _ = Membership.objects.create(person=bob, group=rock)
|
|
||||||
>>> _ = Membership.objects.create(person=jim, group=rock, price=50)
|
|
||||||
>>> _ = Membership.objects.create(person=bob, group=roll, price=50)
|
|
||||||
>>> rock.members.filter(membership__price=50)
|
|
||||||
[<Person: Jim>]
|
|
||||||
|
|
||||||
## Regression test for #8254
|
|
||||||
>>> bob.group_set.filter(membership__price=50)
|
|
||||||
[<Group: Roll>]
|
|
||||||
|
|
||||||
## Regression test for #9804
|
|
||||||
# Flush the database, just to make sure we can.
|
|
||||||
>>> management.call_command('flush', verbosity=0, interactive=False)
|
|
||||||
|
|
||||||
## Regression test for #11107
|
|
||||||
Ensure that sequences on m2m_through tables are being created for the through
|
|
||||||
model, not for a phantom auto-generated m2m table.
|
|
||||||
|
|
||||||
>>> management.call_command('loaddata', 'm2m_through', verbosity=0)
|
|
||||||
>>> management.call_command('dumpdata', 'm2m_through_regress', format='json')
|
|
||||||
[{"pk": 1, "model": "m2m_through_regress.usermembership", "fields": {"price": 100, "group": 1, "user": 1}}, {"pk": 1, "model": "m2m_through_regress.person", "fields": {"name": "Guido"}}, {"pk": 1, "model": "m2m_through_regress.group", "fields": {"name": "Python Core Group"}}]
|
|
||||||
|
|
||||||
"""}
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,126 @@
|
||||||
|
try:
|
||||||
|
from cStringIO import StringIO
|
||||||
|
except ImportError:
|
||||||
|
from StringIO import StringIO
|
||||||
|
|
||||||
|
from django.core import management
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
from models import Person, Group, Membership, UserMembership
|
||||||
|
|
||||||
|
|
||||||
|
class M2MThroughTestCase(TestCase):
|
||||||
|
def test_everything(self):
|
||||||
|
bob = Person.objects.create(name="Bob")
|
||||||
|
jim = Person.objects.create(name="Jim")
|
||||||
|
|
||||||
|
rock = Group.objects.create(name="Rock")
|
||||||
|
roll = Group.objects.create(name="Roll")
|
||||||
|
|
||||||
|
frank = User.objects.create_user("frank", "frank@example.com", "password")
|
||||||
|
jane = User.objects.create_user("jane", "jane@example.com", "password")
|
||||||
|
|
||||||
|
Membership.objects.create(person=bob, group=rock)
|
||||||
|
Membership.objects.create(person=bob, group=roll)
|
||||||
|
Membership.objects.create(person=jim, group=rock)
|
||||||
|
|
||||||
|
self.assertQuerysetEqual(
|
||||||
|
bob.group_set.all(), [
|
||||||
|
"<Group: Rock>",
|
||||||
|
"<Group: Roll>",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertQuerysetEqual(
|
||||||
|
roll.members.all(), [
|
||||||
|
"<Person: Bob>",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertRaises(AttributeError, setattr, bob, "group_set", [])
|
||||||
|
self.assertRaises(AttributeError, setattr, roll, "members", [])
|
||||||
|
|
||||||
|
self.assertRaises(AttributeError, rock.members.create, name="Anne")
|
||||||
|
self.assertRaises(AttributeError, bob.group_set.create, name="Funk")
|
||||||
|
|
||||||
|
UserMembership.objects.create(user=frank, group=rock)
|
||||||
|
UserMembership.objects.create(user=frank, group=roll)
|
||||||
|
UserMembership.objects.create(user=jane, group=rock)
|
||||||
|
|
||||||
|
self.assertQuerysetEqual(
|
||||||
|
frank.group_set.all(), [
|
||||||
|
"<Group: Rock>",
|
||||||
|
"<Group: Roll>",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertQuerysetEqual(
|
||||||
|
roll.user_members.all(), [
|
||||||
|
"<User: frank>",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_serialization(self):
|
||||||
|
"m2m-through models aren't serialized as m2m fields. Refs #8134"
|
||||||
|
|
||||||
|
p = Person.objects.create(name="Bob")
|
||||||
|
g = Group.objects.create(name="Roll")
|
||||||
|
Membership.objects.create(person=p, group=g)
|
||||||
|
|
||||||
|
out = StringIO()
|
||||||
|
management.call_command("dumpdata", "m2m_through_regress", format="json", stdout=out)
|
||||||
|
self.assertEqual(out.getvalue().strip(), """[{"pk": 1, "model": "m2m_through_regress.membership", "fields": {"person": 1, "price": 100, "group": 1}}, {"pk": 1, "model": "m2m_through_regress.person", "fields": {"name": "Bob"}}, {"pk": 1, "model": "m2m_through_regress.group", "fields": {"name": "Roll"}}]""")
|
||||||
|
|
||||||
|
out = StringIO()
|
||||||
|
management.call_command("dumpdata", "m2m_through_regress", format="xml",
|
||||||
|
indent=2, stdout=out)
|
||||||
|
self.assertEqual(out.getvalue().strip(), """
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<django-objects version="1.0">
|
||||||
|
<object pk="1" model="m2m_through_regress.membership">
|
||||||
|
<field to="m2m_through_regress.person" name="person" rel="ManyToOneRel">1</field>
|
||||||
|
<field to="m2m_through_regress.group" name="group" rel="ManyToOneRel">1</field>
|
||||||
|
<field type="IntegerField" name="price">100</field>
|
||||||
|
</object>
|
||||||
|
<object pk="1" model="m2m_through_regress.person">
|
||||||
|
<field type="CharField" name="name">Bob</field>
|
||||||
|
</object>
|
||||||
|
<object pk="1" model="m2m_through_regress.group">
|
||||||
|
<field type="CharField" name="name">Roll</field>
|
||||||
|
</object>
|
||||||
|
</django-objects>
|
||||||
|
""".strip())
|
||||||
|
|
||||||
|
def test_join_trimming(self):
|
||||||
|
"Check that we don't involve too many copies of the intermediate table when doing a join. Refs #8046, #8254"
|
||||||
|
bob = Person.objects.create(name="Bob")
|
||||||
|
jim = Person.objects.create(name="Jim")
|
||||||
|
|
||||||
|
rock = Group.objects.create(name="Rock")
|
||||||
|
roll = Group.objects.create(name="Roll")
|
||||||
|
|
||||||
|
Membership.objects.create(person=bob, group=rock)
|
||||||
|
Membership.objects.create(person=jim, group=rock, price=50)
|
||||||
|
Membership.objects.create(person=bob, group=roll, price=50)
|
||||||
|
|
||||||
|
self.assertQuerysetEqual(
|
||||||
|
rock.members.filter(membership__price=50), [
|
||||||
|
"<Person: Jim>",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
self.assertQuerysetEqual(
|
||||||
|
bob.group_set.filter(membership__price=50), [
|
||||||
|
"<Group: Roll>",
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
class ThroughLoadDataTestCase(TestCase):
|
||||||
|
fixtures = ["m2m_through"]
|
||||||
|
|
||||||
|
def test_sequence_creation(self):
|
||||||
|
"Check that sequences on an m2m_through are created for the through model, not a phantom auto-generated m2m table. Refs #11107"
|
||||||
|
out = StringIO()
|
||||||
|
management.call_command("dumpdata", "m2m_through_regress", format="json", stdout=out)
|
||||||
|
self.assertEqual(out.getvalue().strip(), """[{"pk": 1, "model": "m2m_through_regress.usermembership", "fields": {"price": 100, "group": 1, "user": 1}}, {"pk": 1, "model": "m2m_through_regress.person", "fields": {"name": "Guido"}}, {"pk": 1, "model": "m2m_through_regress.group", "fields": {"name": "Python Core Group"}}]""")
|
||||||
Loading…
Reference in New Issue