p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #23101 db_table wasn't copied in deconstruct 

Forward port of 999758fc7a from
stable/1.7.x
This commit is contained in:
Abraham Martin 2014-07-26 18:48:36 +02:00 committed by Andrew Godwin
parent 805774df1f
commit e1347e9253
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/fields/related.py
View File

@ -2138,6 +2138,8 @@ class ManyToManyField(RelatedField):
def deconstruct(self): def deconstruct(self):
name, path, args, kwargs = super(ManyToManyField, self).deconstruct() name, path, args, kwargs = super(ManyToManyField, self).deconstruct()
# Handle the simpler arguments # Handle the simpler arguments
if self.db_table is not None:
kwargs['db_table'] = self.db_table
if self.rel.db_constraint is not True: if self.rel.db_constraint is not True:
kwargs['db_constraint'] = self.rel.db_constraint kwargs['db_constraint'] = self.rel.db_constraint
if "help_text" in kwargs: if "help_text" in kwargs:

6
tests/field_deconstruction/tests.py
View File

@ -271,6 +271,12 @@ class FieldDeconstructionTests(TestCase):
self.assertEqual(path, "django.db.models.ManyToManyField") self.assertEqual(path, "django.db.models.ManyToManyField")
self.assertEqual(args, []) self.assertEqual(args, [])
self.assertEqual(kwargs, {"to": "auth.Permission", "through": "auth.Group"}) self.assertEqual(kwargs, {"to": "auth.Permission", "through": "auth.Group"})
# Test custom db_table
field = models.ManyToManyField("auth.Permission", db_table="custom_table")
name, path, args, kwargs = field.deconstruct()
self.assertEqual(path, "django.db.models.ManyToManyField")
self.assertEqual(args, [])
self.assertEqual(kwargs, {"to": "auth.Permission", "db_table": "custom_table"})
@override_settings(AUTH_USER_MODEL="auth.Permission") @override_settings(AUTH_USER_MODEL="auth.Permission")
def test_many_to_many_field_swapped(self): def test_many_to_many_field_swapped(self):