Changeset 8782

Timestamp:

08/31/08 19:49:03 (3 months ago)

Author:

mtredinnick

Message:

Fixed #8316 -- Put tighter restrictions on the type of Foreign Key fields
created for MySQL (because MySQL + InnoDB has those restrictions).
Patch from julianb.

Files:

• django/trunk/django/db/backends/__init__.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (1 diff)
• django/trunk/django/db/models/fields/related.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/model_regress/models.py (modified) (2 diffs)

django/trunk/django/db/backends/__init__.py

@@ -72 +72 @@
-    can_use_chunked_reads = True
-    uses_savepoints = False
+    # If True, don't use integer foreign keys referring to, e.g., positive
+    # integer primary keys.
+    related_fields_match_type = False
-
-class BaseDatabaseOperations(object):

django/trunk/django/db/backends/mysql/base.py

@@ -111 +111 @@
-    empty_fetchmany_value = ()
-    update_can_self_select = False
+    related_fields_match_type = True
-
-class DatabaseOperations(BaseDatabaseOperations):

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

@@ -685 +685 @@
-    def contribute_to_related_class(self, cls, related):
-        setattr(cls, related.get_accessor_name(), ForeignRelatedObjectsDescriptor(related))
-
+
-    def formfield(self, **kwargs):
-        defaults = {'form_class': forms.ModelChoiceField, 'queryset': self.rel.to._default_manager.complex_filter(self.rel.limit_choices_to)}
@@ -696 +696 @@
-        # points to an AutoField/PositiveIntegerField/PositiveSmallIntegerField,
-        # in which case the column type is simply that of an IntegerField.
+        # 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()
-
+
+
+
+
-            return IntegerField().db_type()
-        return rel_field.db_type()

django/trunk/tests/regressiontests/model_regress/models.py

@@ -32 +32 @@
-class Event(models.Model):
-    when = models.DateTimeField()
+
+class Department(models.Model):
+    id = models.PositiveIntegerField(primary_key=True)
+    name = models.CharField(max_length=200)
+
+    def __unicode__(self):
+        return self.name
+
+class Worker(models.Model):
+    department = models.ForeignKey(Department)
+    name = models.CharField(max_length=200)
+
+    def __unicode__(self):
+        return self.name
-
-__test__ = {'API_TESTS': """
@@ -96 +110 @@
->>> e.get_previous_by_when().when
-datetime.datetime(2000, 1, 1, 6, 1, 1)
+
+# Check Department and Worker
+>>> d = Department(id=10, name='IT')
+>>> d.save()
+>>> w = Worker(department=d, name='Full-time')
+>>> w.save()
+>>> w
+<Worker: Full-time>
+
-"""
-}