summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-07-30 02:55:20 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-07-30 02:55:20 +0000
commit8b73acdf4da82840eebfe2fb77e4806cf37a23c4 (patch)
tree4eb5fd816d53e4fac84de40a17f7042378d262b0
parentf185a58025ecd48b5557a520e4dcc4de15f85c18 (diff)
Fixed #13730 -- Removed the hard-coding of the requirement that ForeignKeys have an index. Thanks to Suor for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/models/fields/related.py5
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