mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-22 00:04:43 +00:00
Code Issues 32 Releases Wiki Activity

[1.7.x] Added missing logic to TimeField.deconstruct().

Browse Source 
If auto_now or auto_now_add was used then the serialized
field in the migration contained unnecessary `editable` and
`blank` arguments.

Backport of 74325339327e5b8a2480aee7f482bc71f73c71f9 from master.
This commit is contained in:
Baptiste Mispelon 2014-08-03 14:02:21 +02:00
parent 2c5eee9f88
commit 0b1d0afc92
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/fields/__init__.py
View File

@ -1916,6 +1916,9 @@ class TimeField(Field):
kwargs["auto_now"] = self.auto_now
if self.auto_now_add is not False:
kwargs["auto_now_add"] = self.auto_now_add
if self.auto_now or self.auto_now_add:
del kwargs['blank']
del kwargs['editable']
return name, path, args, kwargs
def get_internal_type(self):

17
tests/field_deconstruction/tests.py
View File

@ -336,6 +336,23 @@ class FieldDeconstructionTests(TestCase):
self.assertEqual(args, [])
self.assertEqual(kwargs, {})
def test_time_field(self):
field = models.TimeField()
name, path, args, kwargs = field.deconstruct()
self.assertEqual(path, "django.db.models.TimeField")
self.assertEqual(args, [])
self.assertEqual(kwargs, {})
field = models.TimeField(auto_now=True)
name, path, args, kwargs = field.deconstruct()
self.assertEqual(args, [])
self.assertEqual(kwargs, {'auto_now': True})
field = models.TimeField(auto_now_add=True)
name, path, args, kwargs = field.deconstruct()
self.assertEqual(args, [])
self.assertEqual(kwargs, {'auto_now_add': True})
def test_url_field(self):
field = models.URLField()
name, path, args, kwargs = field.deconstruct()