Ticket #8316: db-mysqltypeissue.4.diff

django/db/backends/__init__.py

@@ -71 +71 @@
     interprets_empty_strings_as_nulls = False
     can_use_chunked_reads = True
     uses_savepoints = False
+    keys_need_similar_types = False
 
 class BaseDatabaseOperations(object):
     """

django/db/backends/mysql/base.py

@@ -80 +80 @@
 class DatabaseFeatures(BaseDatabaseFeatures):
     empty_fetchmany_value = ()
     update_can_self_select = False
+    keys_need_similar_types = True
 
 class DatabaseOperations(BaseDatabaseOperations):
     def date_extract_sql(self, lookup_type, field_name):

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(IntegerField):
+    pass
+
 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
@@ -713 +713 @@
         # points to an AutoField/PositiveIntegerField/PositiveSmallIntegerField,
         # in which case the column type is simply that of an IntegerField.
         rel_field = self.rel.get_related_field()
-        if isinstance(rel_field, (AutoField, PositiveIntegerField, PositiveSmallIntegerField)):
-            return IntegerField().db_type()
+        if isinstance(rel_field, AutoField) \
+            or (not connection.features.keys_need_similar_types and 
+                isinstance(rel_field, (AutoField, 
+                                       PositiveIntegerField, 
+                                       PositiveSmallIntegerField))):
+            return KeyField().db_type()
         return rel_field.db_type()
 
 class OneToOneField(ForeignKey):