Added missing deconstruct() methods.

This commit is contained in:
Baptiste Mispelon 2013-12-06 15:21:13 +01:00
parent 72479a2957
commit 621c25c419
5 changed files with 25 additions and 4 deletions

View File

@ -15,6 +15,7 @@ from django.db.models.fields.files import FileField, ImageField # NOQA
from django.db.models.fields.related import ( # NOQA from django.db.models.fields.related import ( # NOQA
ForeignKey, ForeignObject, OneToOneField, ManyToManyField, ForeignKey, ForeignObject, OneToOneField, ManyToManyField,
ManyToOneRel, ManyToManyRel, OneToOneRel) ManyToOneRel, ManyToManyRel, OneToOneRel)
from django.db.models.fields.proxy import OrderWrt
from django.db.models.deletion import ( # NOQA from django.db.models.deletion import ( # NOQA
CASCADE, PROTECT, SET, SET_NULL, SET_DEFAULT, DO_NOTHING, ProtectedError) CASCADE, PROTECT, SET, SET_NULL, SET_DEFAULT, DO_NOTHING, ProtectedError)
from django.db.models import signals # NOQA from django.db.models import signals # NOQA

View File

@ -230,6 +230,8 @@ class Field(object):
path = path.replace("django.db.models.fields.related", "django.db.models") path = path.replace("django.db.models.fields.related", "django.db.models")
if path.startswith("django.db.models.fields.files"): if path.startswith("django.db.models.fields.files"):
path = path.replace("django.db.models.fields.files", "django.db.models") path = path.replace("django.db.models.fields.files", "django.db.models")
if path.startswith("django.db.models.fields.proxy"):
path = path.replace("django.db.models.fields.proxy", "django.db.models")
if path.startswith("django.db.models.fields"): if path.startswith("django.db.models.fields"):
path = path.replace("django.db.models.fields", "django.db.models") path = path.replace("django.db.models.fields", "django.db.models")
# Return basic info - other fields should override this. # Return basic info - other fields should override this.

View File

@ -16,3 +16,8 @@ class OrderWrt(fields.IntegerField):
kwargs['name'] = '_order' kwargs['name'] = '_order'
kwargs['editable'] = False kwargs['editable'] = False
super(OrderWrt, self).__init__(*args, **kwargs) super(OrderWrt, self).__init__(*args, **kwargs)
def deconstruct(self):
name, path, args, kwargs = super(OrderWrt, self).deconstruct()
del kwargs['editable']
return name, path, args, kwargs

View File

@ -1019,6 +1019,16 @@ class ForeignObject(RelatedField):
super(ForeignObject, self).__init__(**kwargs) super(ForeignObject, self).__init__(**kwargs)
def deconstruct(self):
name, path, args, kwargs = super(ForeignObject, self).deconstruct()
kwargs['from_fields'] = self.from_fields
kwargs['to_fields'] = self.to_fields
if isinstance(self.rel.to, six.string_types):
kwargs['to'] = self.rel.to
else:
kwargs['to'] = "%s.%s" % (self.rel.to._meta.app_label, self.rel.to._meta.object_name)
return name, path, args, kwargs
def resolve_related_fields(self): def resolve_related_fields(self):
if len(self.from_fields) < 1 or len(self.from_fields) != len(self.to_fields): if len(self.from_fields) < 1 or len(self.from_fields) != len(self.to_fields):
raise ValueError('Foreign Object from and to fields must be the same non-zero length') raise ValueError('Foreign Object from and to fields must be the same non-zero length')
@ -1243,6 +1253,8 @@ class ForeignKey(ForeignObject):
def deconstruct(self): def deconstruct(self):
name, path, args, kwargs = super(ForeignKey, self).deconstruct() name, path, args, kwargs = super(ForeignKey, self).deconstruct()
del kwargs['to_fields']
del kwargs['from_fields']
# Handle the simpler arguments # Handle the simpler arguments
if self.db_index: if self.db_index:
del kwargs['db_index'] del kwargs['db_index']
@ -1255,10 +1267,6 @@ class ForeignKey(ForeignObject):
# Rel needs more work. # Rel needs more work.
if self.rel.field_name: if self.rel.field_name:
kwargs['to_field'] = self.rel.field_name kwargs['to_field'] = self.rel.field_name
if isinstance(self.rel.to, six.string_types):
kwargs['to'] = self.rel.to
else:
kwargs['to'] = "%s.%s" % (self.rel.to._meta.app_label, self.rel.to._meta.object_name)
return name, path, args, kwargs return name, path, args, kwargs
@property @property

View File

@ -115,6 +115,11 @@ class TeamField(six.with_metaclass(models.SubfieldBase, models.CharField)):
def value_to_string(self, obj): def value_to_string(self, obj):
return self._get_val_from_obj(obj).to_string() return self._get_val_from_obj(obj).to_string()
def deconstruct(self):
name, path, args, kwargs = super(TeamField, self).deconstruct()
del kwargs['max_length']
return name, path, args, kwargs
@python_2_unicode_compatible @python_2_unicode_compatible
class Player(models.Model): class Player(models.Model):