diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-07-30 02:59:14 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-07-30 02:59:14 +0000 |
| commit | c61811a8f2679fe0dd9943f228e62756e38fb1dc (patch) | |
| tree | 08238fdea5df3fc0abb82a755909d2b9f92574ea | |
| parent | 3227cc59511454d311e4dd8f9f5293b0f06664e9 (diff) | |
[1.2.X] Fixed #13730 -- Removed the hard-coding of the requirement that ForeignKeys have an index. Thanks to Suor for the report.
Backport of r13452 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/models/fields/related.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 5830a794df..232d5d5e74 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -812,6 +812,9 @@ class ForeignKey(RelatedField, Field): to_field = to_field or (to._meta.pk and to._meta.pk.name) kwargs['verbose_name'] = kwargs.get('verbose_name', None) + if 'db_index' not in kwargs: + kwargs['db_index'] = True + kwargs['rel'] = rel_class(to, to_field, related_name=kwargs.pop('related_name', None), limit_choices_to=kwargs.pop('limit_choices_to', None), @@ -819,8 +822,6 @@ class ForeignKey(RelatedField, Field): parent_link=kwargs.pop('parent_link', False)) Field.__init__(self, **kwargs) - self.db_index = True - def validate(self, value, model_instance): if self.rel.parent_link: return |