Changeset 7133

Timestamp:

02/18/08 20:58:41 (5 months ago)

Author:

mtredinnick

Message:

It makes sense that when you subclass an existing model field, you're often
going to be using the same database column type. Made that properly
inheritable (previously it was using the class name), at the cost of a little
more verboseness.

This is very slightly backwards incompatible (for subclasses of existing fields
that were relying on the old default).

Fixed #6556.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (22 diffs)

django/trunk/django/db/models/fields/__init__.py

@@ -448 +448 @@
-        Field.__init__(self, *args, **kwargs)
-
+    def get_internal_type(self):
+        return "BooleanField"
+
-    def to_python(self, value):
-        if value in (True, False): return value
@@ -465 +468 @@
-    def get_manipulator_field_objs(self):
-        return [oldforms.TextField]
+
+    def get_internal_type(self):
+        return "CharField"
-
-    def to_python(self, value):
@@ -495 +501 @@
-            kwargs['blank'] = True
-        Field.__init__(self, verbose_name, name, **kwargs)
+
+    def get_internal_type(self):
+        return "DateField"
-
-    def to_python(self, value):
@@ -565 +574 @@
-
-class DateTimeField(DateField):
+    def get_internal_type(self):
+        return "DateTimeField"
+
-    def to_python(self, value):
-        if value is None:
@@ -635 +647 @@
-        Field.__init__(self, verbose_name, name, **kwargs)
-
+    def get_internal_type(self):
+        return "DecimalField"
+
-    def to_python(self, value):
-        if value is None:
@@ -694 +709 @@
-        CharField.__init__(self, *args, **kwargs)
-
-    def get_internal_type(self):
-        return "CharField"
-
-    def get_manipulator_field_objs(self):
-        return [oldforms.EmailField]
@@ -713 +725 @@
-        kwargs['max_length'] = kwargs.get('max_length', 100)
-        Field.__init__(self, verbose_name, name, **kwargs)
+
+    def get_internal_type(self):
+        return "FileField"
-
-    def get_db_prep_save(self, value):
@@ -823 +838 @@
-        return [curry(oldforms.FilePathField, path=self.path, match=self.match, recursive=self.recursive)]
-
+    def get_internal_type(self):
+        return "FilePathField"
+
-class FloatField(Field):
-    empty_strings_allowed = False
@@ -828 +846 @@
-    def get_manipulator_field_objs(self):
-        return [oldforms.FloatField]
+
+    def get_internal_type(self):
+        return "FloatField"
-
-    def formfield(self, **kwargs):
@@ -850 +871 @@
-        if not self.height_field:
-            setattr(cls, 'get_%s_height' % self.name, curry(cls._get_FIELD_height, field=self))
+
+    def get_internal_type(self):
+        return "ImageField"
-
-    def save_file(self, new_data, new_object, original_object, change, rel, save=True):
@@ -873 +897 @@
-        return [oldforms.IntegerField]
-
+    def get_internal_type(self):
+        return "IntegerField"
+
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.IntegerField}
@@ -887 +914 @@
-        return [oldforms.IPAddressField]
-
+    def get_internal_type(self):
+        return "IPAddressField"
+
-    def validate(self, field_data, all_data):
-        validators.isValidIPAddress4(field_data, None)
@@ -900 +930 @@
-        kwargs['null'] = True
-        Field.__init__(self, *args, **kwargs)
+
+    def get_internal_type(self):
+        return "NullBooleanField"
-
-    def to_python(self, value):
@@ -920 +953 @@
-        return [oldforms.PhoneNumberField]
-
+    def get_internal_type(self):
+        return "PhoneNumberField"
+
-    def validate(self, field_data, all_data):
-        validators.isValidPhone(field_data, all_data)
@@ -933 +969 @@
-        return [oldforms.PositiveIntegerField]
-
+    def get_internal_type(self):
+        return "PositiveIntegerField"
+
-    def formfield(self, **kwargs):
-        defaults = {'min_value': 0}
@@ -941 +980 @@
-    def get_manipulator_field_objs(self):
-        return [oldforms.PositiveSmallIntegerField]
+
+    def get_internal_type(self):
+        return "PositiveSmallIntegerField"
-
-    def formfield(self, **kwargs):
@@ -956 +998 @@
-        super(SlugField, self).__init__(*args, **kwargs)
-
+    def get_internal_type(self):
+        return "SlugField"
+
-class SmallIntegerField(IntegerField):
-    def get_manipulator_field_objs(self):
-        return [oldforms.SmallIntegerField]
-
+    def get_internal_type(self):
+        return "SmallIntegerField"
+
-class TextField(Field):
-    def get_manipulator_field_objs(self):
-        return [oldforms.LargeTextField]
+
+    def get_internal_type(self):
+        return "TextField"
-
-    def formfield(self, **kwargs):
@@ -976 +1027 @@
-            kwargs['editable'] = False
-        Field.__init__(self, verbose_name, name, **kwargs)
+
+    def get_internal_type(self):
+        return "TimeField"
-
-    def get_db_prep_lookup(self, lookup_type, value):
@@ -1041 +1095 @@
-        return [oldforms.URLField]
-
-    def get_internal_type(self):
-        return "CharField"
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.URLField, 'verify_exists': self.verify_exists}
@@ -1052 +1103 @@
-    def get_manipulator_field_objs(self):
-        return [oldforms.USStateField]
+
+    def get_internal_type(self):
+        return "USStateField"
-
-    def formfield(self, **kwargs):
@@ -1063 +1117 @@
-        self.schema_path = schema_path
-        Field.__init__(self, verbose_name, name, **kwargs)
-
-    def get_internal_type(self):
-        return "TextField"
-
-    def get_manipulator_field_objs(self):
@@ -1077 +1128 @@
-        IntegerField.__init__(self, **kwargs )
-
-    def get_internal_type(self):
-        return "IntegerField"
-
-    def get_manipulator_fields(self, opts, manipulator, change, name_prefix='', rel=False, follow=True):
-        return [oldforms.HiddenField(name_prefix + self.name)]