From dc2933f73b4a970d6b37241b6f185bbbacd1bb69 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Fri, 15 Jul 2005 18:40:21 +0000
Subject: [PATCH] Fixed #3 -- Made OneToOneField act like ForeignKey and
ManyToManyField. This is the last big API change before the official launch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@59 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/core/meta.py | 17 +++++++++++++++++
docs/db-api.txt | 5 ++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/django/core/meta.py b/django/core/meta.py
index 3915d5d1b8..e52a7900e0 100644
--- a/django/core/meta.py
+++ b/django/core/meta.py
@@ -2076,6 +2076,23 @@ class ManyToManyField(Field):
choices = self.get_choices(include_blank=False)
return [curry(formfields.SelectMultipleField, size=min(max(len(choices), 5), 15), choices=choices)]
+class OneToOneField(IntegerField):
+ def __init__(self, to, to_field=None, rel_name=None, **kwargs):
+ kwargs['name'] = kwargs.get('name', 'id')
+ kwargs['verbose_name'] = kwargs.get('verbose_name', 'ID')
+ to_field = to_field or to._meta.pk.name
+ rel_name = rel_name or to._meta.object_name.lower()
+ kwargs['rel'] = OneToOne(to, rel_name, to_field,
+ num_in_admin=kwargs.pop('num_in_admin', 0),
+ edit_inline=kwargs.pop('edit_inline', False),
+ edit_inline_type=kwargs.pop('edit_inline_type', STACKED),
+ related_name=kwargs.pop('related_name', None),
+ limit_choices_to=kwargs.pop('limit_choices_to', None),
+ lookup_overrides=kwargs.pop('lookup_overrides', None),
+ raw_id_admin=kwargs.pop('raw_id_admin', False))
+ kwargs['primary_key'] = True
+ IntegerField.__init__(self, **kwargs)
+
####################
# RELATIONSHIPS #
####################
diff --git a/docs/db-api.txt b/docs/db-api.txt
index 2a41e9b373..f96b3ebca8 100644
--- a/docs/db-api.txt
+++ b/docs/db-api.txt
@@ -141,8 +141,7 @@ method. For example::
class Restaurant(meta.Model):
...
fields = (
- meta.IntegerField('id', 'ID', primary_key=True,
- rel=meta.OneToOne(places.Place, 'place', 'id')),
+ meta.OneToOneField(places.Place),
...
)
@@ -294,7 +293,7 @@ For example::
Changing objects
================
-Once you've retrieved an object from the database using any of the above
+Once you've retrieved an object from the database using any of the above
options, changing it is extremely easy. Make changes directly to the
objects fields, then call the object's ``save()`` method::