Ticket #8316: db-mysqltypeissue.2.diff

django/db/backends/mysql/creation.py

@@ -19 +19 @@
         'FloatField':        'double precision',
         'IntegerField':      'integer',
         'IPAddressField':    'char(15)',
+        'KeyField':          'integer',
         'NullBooleanField':  'bool',
-        'OneToOneField':     'integer',
         'PhoneNumberField':  'varchar(20)',
         'PositiveIntegerField': 'integer UNSIGNED',
         'PositiveSmallIntegerField': 'smallint UNSIGNED',

django/db/backends/oracle/creation.py

@@ -28 +28 @@
         'FloatField':                   'DOUBLE PRECISION',
         'IntegerField':                 'NUMBER(11)',
         'IPAddressField':               'VARCHAR2(15)',
+        'KeyField':                     'NUMBER(11)',
         'NullBooleanField':             'NUMBER(1) CHECK ((%(qn_column)s IN (0,1)) OR (%(qn_column)s IS NULL))',
-        'OneToOneField':                'NUMBER(11)',
         'PhoneNumberField':             'VARCHAR2(20)',
         'PositiveIntegerField':         'NUMBER(11) CHECK (%(qn_column)s >= 0)',
         'PositiveSmallIntegerField':    'NUMBER(11) CHECK (%(qn_column)s >= 0)',

django/db/backends/postgresql/creation.py

@@ -19 +19 @@
         'FloatField':        'double precision',
         'IntegerField':      'integer',
         'IPAddressField':    'inet',
+        'KeyField':          'integer',
         'NullBooleanField':  'boolean',
-        'OneToOneField':     'integer',
         'PhoneNumberField':  'varchar(20)',
         'PositiveIntegerField': 'integer CHECK ("%(column)s" >= 0)',
         'PositiveSmallIntegerField': 'smallint CHECK ("%(column)s" >= 0)',

django/db/backends/sqlite3/creation.py

@@ -20 +20 @@
         'FloatField':                   'real',
         'IntegerField':                 'integer',
         'IPAddressField':               'char(15)',
+        'KeyField':                     'integer',
         'NullBooleanField':             'bool',
-        'OneToOneField':                'integer',
         'PhoneNumberField':             'varchar(20)',
         'PositiveIntegerField':         'integer unsigned',
         'PositiveSmallIntegerField':    'smallint unsigned',

django/db/models/fields/__init__.py

@@ -808 +808 @@
         defaults.update(kwargs)
         return super(IPAddressField, self).formfield(**defaults)
 
+class KeyField(Field):
+    empty_strings_allowed = False
+    def get_db_prep_value(self, value):
+        if value is None:
+            return None
+        return int(value)
+
+    def get_manipulator_field_objs(self):
+        return [oldforms.IntegerField]
+
+    def get_internal_type(self):
+        return "KeyField"
+
+    def formfield(self, **kwargs):
+        defaults = {'form_class': forms.IntegerField}
+        defaults.update(kwargs)
+        return super(KeyField, self).formfield(**defaults)
+
 class NullBooleanField(Field):
     empty_strings_allowed = False
     def __init__(self, *args, **kwargs):

django/db/models/fields/related.py

@@ -1 +1 @@
 from django.db import connection, transaction
 from django.db.models import signals, get_model
-from django.db.models.fields import AutoField, Field, IntegerField, PositiveIntegerField, PositiveSmallIntegerField, FieldDoesNotExist
+from django.db.models.fields import AutoField, Field, KeyField, PositiveIntegerField, PositiveSmallIntegerField, FieldDoesNotExist
 from django.db.models.related import RelatedObject
 from django.db.models.query import QuerySet
 from django.db.models.query_utils import QueryWrapper
@@ -710 +710 @@
     def db_type(self):
         # The database column type of a ForeignKey is the column type
         # of the field to which it points. An exception is if the ForeignKey
-        # points to an AutoField/PositiveIntegerField/PositiveSmallIntegerField,
-        # in which case the column type is simply that of an IntegerField.
+        # points to an AutoField, in which case the column type is simply that 
+        # of a KeyField.
         rel_field = self.rel.get_related_field()
-        if isinstance(rel_field, (AutoField, PositiveIntegerField, PositiveSmallIntegerField)):
-            return IntegerField().db_type()
+        if isinstance(rel_field, AutoField):
+            return KeyField().db_type()
         return rel_field.db_type()
 
 class OneToOneField(ForeignKey):