Ticket #16385: 043f2c08b87dda585d40a1ab225106543909f4a6.diff

django/db/backends/__init__.py

@@ -671 +671 @@
     # need not necessarily be implemented using "LIKE" in the backend.
     prep_for_iexact_query = prep_for_like_query
 
+    def value_to_db_auto(self, value):
+        """
+        Transform a value to an object compatible with the auto field required
+        by the backend driver for auto columns.
+        """
+        if value is None:
+            return None
+        return int(value)
+
     def value_to_db_date(self, value):
         """
         Transform a date value to an object compatible with what is expected

django/db/models/fields/__init__.py

@@ -474 +474 @@
         return db_type
 
     def to_python(self, value):
-        if value is None:
-            return value
-        try:
-            return int(value)
-        except (TypeError, ValueError):
+        if not (value is None or isinstance(value, (basestring, int, long))):
             raise exceptions.ValidationError(self.error_messages['invalid'])
+        return value
 
     def validate(self, value, model_instance):
         pass
 
     def get_prep_value(self, value):
-        if value is None:
-            return None
-        return int(value)
+        return value
+
+    def get_db_prep_value(self, value, connection, prepared=False):
+        # Casts AutoField into the format expected by the backend
+        if not prepared:
+            value = self.get_prep_value(value)
+        return connection.ops.value_to_db_auto(value)
 
     def contribute_to_class(self, cls, name):
         assert not cls._meta.has_auto_field, "A model can't have more than one AutoField."

django/db/models/fields/related.py

@@ -1 +1 @@
 from django.conf import settings
-from django.db import connection, router, transaction
+from django.db import connection, router, transaction, connections
 from django.db.backends import util
 from django.db.models import signals, get_model
 from django.db.models.fields import (AutoField, Field, IntegerField,
@@ -873 +873 @@
             return None
         else:
             return self.rel.get_related_field().get_db_prep_save(value,
-                connection=connection)
+                    connection=connections[router.db_for_read(self.rel.to)])
 
     def value_to_string(self, obj):
         if not obj:
@@ -924 +924 @@
         # If the database needs similar types for key fields however, the only
         # thing we can do is making AutoField an IntegerField.
         rel_field = self.rel.get_related_field()
-        if (isinstance(rel_field, AutoField) or
-                (not connection.features.related_fields_match_type and
-                isinstance(rel_field, (PositiveIntegerField,
-                                       PositiveSmallIntegerField)))):
-            return IntegerField().db_type(connection=connection)
-        return rel_field.db_type(connection=connection)
+        return rel_field.related_db_type(connection=connections[router.db_for_read(rel_field.model)])
 
 class OneToOneField(ForeignKey):
     """