Changeset 3846

Timestamp:

09/25/06 21:58:36 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2783 -- Fixed one-to-one fields to work with any primary key data type
in the related model. Thanks, Joel Heenan.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (1 diff)
• django/trunk/tests/modeltests/one_to_one/models.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -83 +83 @@
-    Brant Harris
-    heckj@mac.com
+    Joel Heenan <joelh-django@planetjoel.com>
-    hipertracker@gmail.com
-    Ian Holsman <http://feh.holsman.net/>

django/trunk/django/core/management.py

@@ -148 +148 @@
-    pending_references = {}
-    for f in opts.fields:
-models.ForeignKey
+(models.ForeignKey, models.OneToOneField)
-            rel_field = f.rel.get_related_field()
-            data_type = get_rel_data_type(rel_field)

django/trunk/tests/modeltests/one_to_one/models.py

@@ -30 +30 @@
-    def __str__(self):
-        return "%s the waiter at %s" % (self.name, self.restaurant)
+
+class ManualPrimaryKey(models.Model):
+    primary_key = models.CharField(maxlength=10, primary_key=True)
+    name = models.CharField(maxlength = 50)
+
+class RelatedModel(models.Model):
+    link = models.OneToOneField(ManualPrimaryKey)
+    name = models.CharField(maxlength = 50)
-
-__test__ = {'API_TESTS':"""
@@ -152 +160 @@
->>> r = Restaurant.objects.get(pk=1)
->>> r.delete()
+
+# One-to-one fields still work if you create your own primary key
+>>> o1 = ManualPrimaryKey(primary_key="abc123", name="primary")
+>>> o1.save()
+>>> o2 = RelatedModel(link=o1, name="secondary")
+>>> o2.save()
-"""}